Add extra to pass in if we want the default onBackPressed behavior for the...

Add extra to pass in if we want the default onBackPressed behavior for the Activity and want it to finish

app/src/main/java/chat/rocket/android/activity/AbstractFragmentActivity.java

 package chat.rocket.android.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.IdRes;
 import android.support.annotation.Nullable;
@@ -13,9 +14,16 @@ import icepick.Icepick;
 
 abstract class AbstractFragmentActivity extends RxAppCompatActivity {
 
+  public static final String EXTRA_FINISH_ON_BACK_PRESS = "EXTRA_FINISH_ON_BACK_PRESS";
+  private boolean finishOnBackPress;
+
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    Intent intent = getIntent();
+    if (intent != null) {
+      finishOnBackPress = intent.getBooleanExtra(EXTRA_FINISH_ON_BACK_PRESS, false);
+    }
     Icepick.restoreInstanceState(this, savedInstanceState);
   }
 
@@ -30,8 +38,13 @@ abstract class AbstractFragmentActivity extends RxAppCompatActivity {
 
   @Override
   public final void onBackPressed() {
-    if (!onBackPress()) {
-      onBackPressedNotHandled();
+    if (finishOnBackPress) {
+      super.onBackPressed();
+      finish();
+    } else {
+      if (!onBackPress()) {
+        onBackPressedNotHandled();
+      }
     }
   }