clear parent activities pending view intent before calling startAcitvityForResult()

Daniel Gultsch created

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java  |   24 
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java | 1169 
src/main/java/eu/siacs/conversations/ui/util/PendingItem.java      |    6 
3 files changed, 614 insertions(+), 585 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java 🔗

@@ -902,7 +902,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 
     private void handleNegativeActivityResult(int requestCode) {
         switch (requestCode) {
-            //nothing to do for now
+            case ATTACHMENT_CHOICE_TAKE_PHOTO:
+                if (pendingTakePhotoUri.clear()) {
+                    Log.d(Config.LOGTAG,"cleared pending photo uri after negative activity result");
+                }
+                break;
         }
     }
 
@@ -1761,6 +1765,15 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         }
     }
 
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode) {
+        final Activity activity = getActivity();
+        if (activity instanceof ConversationsActivity) {
+            ((ConversationsActivity) activity).clearPendingViewIntent();
+        }
+        super.startActivityForResult(intent, requestCode);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -1872,6 +1885,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     public void reInit(Conversation conversation, Bundle extras) {
         QuickLoader.set(conversation.getUuid());
         this.saveMessageDraftStopAudioPlayer();
+        this.clearPending();
         if (this.reInit(conversation, extras != null)) {
             if (extras != null) {
                 processExtras(extras);
@@ -2662,11 +2676,13 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     }
 
     private void clearPending() {
-        if (postponedActivityResult.pop() != null) {
+        if (postponedActivityResult.clear()) {
             Log.e(Config.LOGTAG, "cleared pending intent with unhandled result left");
         }
-        pendingScrollState.pop();
-        if (pendingTakePhotoUri.pop() != null) {
+        if (pendingScrollState.clear()) {
+            Log.e(Config.LOGTAG,"cleared scroll state");
+        }
+        if (pendingTakePhotoUri.clear()) {
             Log.e(Config.LOGTAG, "cleared pending photo uri");
         }
     }

src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java 🔗

@@ -86,344 +86,351 @@ import static eu.siacs.conversations.ui.ConversationFragment.REQUEST_DECRYPT_PGP
 
 public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoleChanged {
 
-	public static final String ACTION_VIEW_CONVERSATION = "eu.siacs.conversations.action.VIEW";
-	public static final String EXTRA_CONVERSATION = "conversationUuid";
-	public static final String EXTRA_DOWNLOAD_UUID = "eu.siacs.conversations.download_uuid";
-	public static final String EXTRA_TEXT = "text";
-	public static final String EXTRA_AS_QUOTE = "as_quote";
-	public static final String EXTRA_NICK = "nick";
-	public static final String EXTRA_IS_PRIVATE_MESSAGE = "pm";
-
-	private static List<String> VIEW_AND_SHARE_ACTIONS = Arrays.asList(
-			ACTION_VIEW_CONVERSATION,
-			Intent.ACTION_SEND,
-			Intent.ACTION_SEND_MULTIPLE
-	);
-
-	public static final int REQUEST_OPEN_MESSAGE = 0x9876;
-	public static final int REQUEST_PLAY_PAUSE = 0x5432;
-
-
-	//secondary fragment (when holding the conversation, must be initialized before refreshing the overview fragment
-	private static final @IdRes
-	int[] FRAGMENT_ID_NOTIFICATION_ORDER = {R.id.secondary_fragment, R.id.main_fragment};
-	private final PendingItem<Intent> pendingViewIntent = new PendingItem<>();
-	private final PendingItem<ActivityResult> postponedActivityResult = new PendingItem<>();
-	private ActivityConversationsBinding binding;
-	private boolean mActivityPaused = true;
-	private AtomicBoolean mRedirectInProcess = new AtomicBoolean(false);
-
-	private static boolean isViewOrShareIntent(Intent i) {
-		Log.d(Config.LOGTAG,"action: "+(i == null ? null : i.getAction()));
-		return i != null && VIEW_AND_SHARE_ACTIONS.contains(i.getAction()) && i.hasExtra(EXTRA_CONVERSATION);
-	}
-
-	private static Intent createLauncherIntent(Context context) {
-		final Intent intent = new Intent(context, ConversationsActivity.class);
-		intent.setAction(Intent.ACTION_MAIN);
-		intent.addCategory(Intent.CATEGORY_LAUNCHER);
-		return intent;
-	}
-
-	@Override
-	protected void refreshUiReal() {
-		for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
-			refreshFragment(id);
-		}
-	}
-
-	@Override
-	void onBackendConnected() {
-		if (performRedirectIfNecessary(true)) {
-			return;
-		}
-		xmppConnectionService.getNotificationService().setIsInForeground(true);
-		Intent intent = pendingViewIntent.pop();
-		if (intent != null) {
-			if (processViewIntent(intent)) {
-				if (binding.secondaryFragment != null) {
-					notifyFragmentOfBackendConnected(R.id.main_fragment);
-				}
-				invalidateActionBarTitle();
-				return;
-			}
-		}
-		for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
-			notifyFragmentOfBackendConnected(id);
-		}
-
-		ActivityResult activityResult = postponedActivityResult.pop();
-		if (activityResult != null) {
-			handleActivityResult(activityResult);
-		}
-
-		invalidateActionBarTitle();
-		if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) {
-			Conversation conversation = ConversationsOverviewFragment.getSuggestion(this);
-			if (conversation != null) {
-				openConversation(conversation, null);
-			}
-		}
-		showDialogsIfMainIsOverview();
-	}
-
-	private boolean performRedirectIfNecessary(boolean noAnimation) {
-		return performRedirectIfNecessary(null, noAnimation);
-	}
-
-	private boolean performRedirectIfNecessary(final Conversation ignore, final boolean noAnimation) {
-		if (xmppConnectionService == null) {
-			return false;
-		}
-		boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
-		if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
-			final Intent intent = getRedirectionIntent(noAnimation);
-			runOnUiThread(() -> {
-				startActivity(intent);
-				if (noAnimation) {
-					overridePendingTransition(0, 0);
-				}
-			});
-		}
-		return mRedirectInProcess.get();
-	}
-
-	private Intent getRedirectionIntent(boolean noAnimation) {
-		Account pendingAccount = xmppConnectionService.getPendingAccount();
-		Intent intent;
-		if (pendingAccount != null) {
-			intent = new Intent(this, EditAccountActivity.class);
-			intent.putExtra("jid", pendingAccount.getJid().asBareJid().toString());
-		} else {
-			if (xmppConnectionService.getAccounts().size() == 0) {
-				if (Config.X509_VERIFICATION) {
-					intent = new Intent(this, ManageAccountActivity.class);
-				} else if (Config.MAGIC_CREATE_DOMAIN != null) {
-					intent = new Intent(this, WelcomeActivity.class);
-					WelcomeActivity.addInviteUri(intent, getIntent());
-				} else {
-					intent = new Intent(this, EditAccountActivity.class);
-				}
-			} else {
-				intent = new Intent(this, StartConversationActivity.class);
-			}
-		}
-		intent.putExtra("init", true);
-		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-		if (noAnimation) {
-			intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-		}
-		return intent;
-	}
-
-	private void showDialogsIfMainIsOverview() {
-		if (xmppConnectionService == null) {
-			return;
-		}
-		final Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-		if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
-			if (ExceptionHelper.checkForCrash(this)) {
-				return;
-			}
-			openBatteryOptimizationDialogIfNeeded();
-		}
-	}
-
-	private String getBatteryOptimizationPreferenceKey() {
-		@SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
-		return "show_battery_optimization" + (device == null ? "" : device);
-	}
-
-	private void setNeverAskForBatteryOptimizationsAgain() {
-		getPreferences().edit().putBoolean(getBatteryOptimizationPreferenceKey(), false).apply();
-	}
-
-	private void openBatteryOptimizationDialogIfNeeded() {
-		if (hasAccountWithoutPush()
-				&& isOptimizingBattery()
-				&& getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle(R.string.battery_optimizations_enabled);
-			builder.setMessage(R.string.battery_optimizations_enabled_dialog);
-			builder.setPositiveButton(R.string.next, (dialog, which) -> {
-				Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-				Uri uri = Uri.parse("package:" + getPackageName());
-				intent.setData(uri);
-				try {
-					startActivityForResult(intent, REQUEST_BATTERY_OP);
-				} catch (ActivityNotFoundException e) {
-					Toast.makeText(this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
-				}
-			});
-			builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
-			final AlertDialog dialog = builder.create();
-			dialog.setCanceledOnTouchOutside(false);
-			dialog.show();
-		}
-	}
-
-	private boolean hasAccountWithoutPush() {
-		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() == Account.State.ONLINE && !xmppConnectionService.getPushManagementService().available(account)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void notifyFragmentOfBackendConnected(@IdRes int id) {
-		final Fragment fragment = getFragmentManager().findFragmentById(id);
-		if (fragment != null && fragment instanceof OnBackendConnected) {
-			((OnBackendConnected) fragment).onBackendConnected();
-		}
-	}
-
-	private void refreshFragment(@IdRes int id) {
-		final Fragment fragment = getFragmentManager().findFragmentById(id);
-		if (fragment != null && fragment instanceof XmppFragment) {
-			((XmppFragment) fragment).refresh();
-		}
-	}
-
-	private boolean processViewIntent(Intent intent) {
-		String uuid = intent.getStringExtra(EXTRA_CONVERSATION);
-		Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null;
-		if (conversation == null) {
-			Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid);
-			return false;
-		}
-		openConversation(conversation, intent.getExtras());
-		return true;
-	}
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
-		UriHandlerActivity.onRequestPermissionResult(this, requestCode, grantResults);
-		if (grantResults.length > 0) {
-			if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-				switch (requestCode) {
-					case REQUEST_OPEN_MESSAGE:
-						refreshUiReal();
-						ConversationFragment.openPendingMessage(this);
-						break;
-					case REQUEST_PLAY_PAUSE:
-						ConversationFragment.startStopPending(this);
-						break;
-				}
-			}
-		}
-	}
-
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, final Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		ActivityResult activityResult = ActivityResult.of(requestCode, resultCode, data);
-		if (xmppConnectionService != null) {
-			handleActivityResult(activityResult);
-		} else {
-			this.postponedActivityResult.push(activityResult);
-		}
-	}
-
-	private void handleActivityResult(ActivityResult activityResult) {
-		if (activityResult.resultCode == Activity.RESULT_OK) {
-			handlePositiveActivityResult(activityResult.requestCode, activityResult.data);
-		} else {
-			handleNegativeActivityResult(activityResult.requestCode);
-		}
-	}
-
-	private void handleNegativeActivityResult(int requestCode) {
-		Conversation conversation = ConversationFragment.getConversationReliable(this);
-		switch (requestCode) {
-			case REQUEST_DECRYPT_PGP:
-				if (conversation == null) {
-					break;
-				}
-				conversation.getAccount().getPgpDecryptionService().giveUpCurrentDecryption();
-				break;
-			case REQUEST_BATTERY_OP:
-				setNeverAskForBatteryOptimizationsAgain();
-				break;
-		}
-	}
-
-	private void handlePositiveActivityResult(int requestCode, final Intent data) {
-		Conversation conversation = ConversationFragment.getConversationReliable(this);
-		if (conversation == null) {
-			Log.d(Config.LOGTAG, "conversation not found");
-			return;
-		}
-		switch (requestCode) {
-			case REQUEST_DECRYPT_PGP:
-				conversation.getAccount().getPgpDecryptionService().continueDecryption(data);
-				break;
-			case REQUEST_CHOOSE_PGP_ID:
-				long id = data.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0);
-				if (id != 0) {
-					conversation.getAccount().setPgpSignId(id);
-					announcePgp(conversation.getAccount(), null, null, onOpenPGPKeyPublished);
-				} else {
-					choosePgpSignId(conversation.getAccount());
-				}
-				break;
-			case REQUEST_ANNOUNCE_PGP:
-				announcePgp(conversation.getAccount(), conversation, data, onOpenPGPKeyPublished);
-				break;
-		}
-	}
-
-	@Override
-	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		ConversationMenuConfigurator.reloadFeatures(this);
-		OmemoSetting.load(this);
-		new EmojiService(this).init();
-		this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations);
-		setSupportActionBar((Toolbar) binding.toolbar);
-		configureActionBar(getSupportActionBar());
-		this.getFragmentManager().addOnBackStackChangedListener(this::invalidateActionBarTitle);
-		this.getFragmentManager().addOnBackStackChangedListener(this::showDialogsIfMainIsOverview);
-		this.initializeFragments();
-		this.invalidateActionBarTitle();
-		final Intent intent;
-		if (savedInstanceState == null) {
-			intent = getIntent();
-		} else {
-			intent = savedInstanceState.getParcelable("intent");
-		}
-		if (isViewOrShareIntent(intent)) {
-			pendingViewIntent.push(intent);
-			setIntent(createLauncherIntent(this));
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.activity_conversations, menu);
-		MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
-		if (qrCodeScanMenuItem != null) {
-			if (isCameraFeatureAvailable()) {
-				Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-				boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
-						&& fragment != null
-						&& fragment instanceof ConversationsOverviewFragment;
-				qrCodeScanMenuItem.setVisible(visible);
-			} else {
-				qrCodeScanMenuItem.setVisible(false);
-			}
-		}
-		return super.onCreateOptionsMenu(menu);
-	}
-
-	@Override
-	public void onConversationSelected(Conversation conversation) {
-		if (ConversationFragment.getConversation(this) == conversation) {
-			Log.d(Config.LOGTAG, "ignore onConversationSelected() because conversation is already open");
-			return;
-		}
-		openConversation(conversation, null);
-	}
+    public static final String ACTION_VIEW_CONVERSATION = "eu.siacs.conversations.action.VIEW";
+    public static final String EXTRA_CONVERSATION = "conversationUuid";
+    public static final String EXTRA_DOWNLOAD_UUID = "eu.siacs.conversations.download_uuid";
+    public static final String EXTRA_TEXT = "text";
+    public static final String EXTRA_AS_QUOTE = "as_quote";
+    public static final String EXTRA_NICK = "nick";
+    public static final String EXTRA_IS_PRIVATE_MESSAGE = "pm";
+
+    private static List<String> VIEW_AND_SHARE_ACTIONS = Arrays.asList(
+            ACTION_VIEW_CONVERSATION,
+            Intent.ACTION_SEND,
+            Intent.ACTION_SEND_MULTIPLE
+    );
+
+    public static final int REQUEST_OPEN_MESSAGE = 0x9876;
+    public static final int REQUEST_PLAY_PAUSE = 0x5432;
+
+
+    //secondary fragment (when holding the conversation, must be initialized before refreshing the overview fragment
+    private static final @IdRes
+    int[] FRAGMENT_ID_NOTIFICATION_ORDER = {R.id.secondary_fragment, R.id.main_fragment};
+    private final PendingItem<Intent> pendingViewIntent = new PendingItem<>();
+    private final PendingItem<ActivityResult> postponedActivityResult = new PendingItem<>();
+    private ActivityConversationsBinding binding;
+    private boolean mActivityPaused = true;
+    private AtomicBoolean mRedirectInProcess = new AtomicBoolean(false);
+
+    private static boolean isViewOrShareIntent(Intent i) {
+        Log.d(Config.LOGTAG, "action: " + (i == null ? null : i.getAction()));
+        return i != null && VIEW_AND_SHARE_ACTIONS.contains(i.getAction()) && i.hasExtra(EXTRA_CONVERSATION);
+    }
+
+    private static Intent createLauncherIntent(Context context) {
+        final Intent intent = new Intent(context, ConversationsActivity.class);
+        intent.setAction(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_LAUNCHER);
+        return intent;
+    }
+
+    @Override
+    protected void refreshUiReal() {
+        for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
+            refreshFragment(id);
+        }
+    }
+
+    @Override
+    void onBackendConnected() {
+        if (performRedirectIfNecessary(true)) {
+            return;
+        }
+        xmppConnectionService.getNotificationService().setIsInForeground(true);
+        Intent intent = pendingViewIntent.pop();
+        if (intent != null) {
+            if (processViewIntent(intent)) {
+                if (binding.secondaryFragment != null) {
+                    notifyFragmentOfBackendConnected(R.id.main_fragment);
+                }
+                invalidateActionBarTitle();
+                return;
+            }
+        }
+        for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
+            notifyFragmentOfBackendConnected(id);
+        }
+
+        ActivityResult activityResult = postponedActivityResult.pop();
+        if (activityResult != null) {
+            handleActivityResult(activityResult);
+        }
+
+        invalidateActionBarTitle();
+        if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) {
+            Conversation conversation = ConversationsOverviewFragment.getSuggestion(this);
+            if (conversation != null) {
+                openConversation(conversation, null);
+            }
+        }
+        showDialogsIfMainIsOverview();
+    }
+
+    private boolean performRedirectIfNecessary(boolean noAnimation) {
+        return performRedirectIfNecessary(null, noAnimation);
+    }
+
+    private boolean performRedirectIfNecessary(final Conversation ignore, final boolean noAnimation) {
+        if (xmppConnectionService == null) {
+            return false;
+        }
+        boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
+        if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
+            final Intent intent = getRedirectionIntent(noAnimation);
+            runOnUiThread(() -> {
+                startActivity(intent);
+                if (noAnimation) {
+                    overridePendingTransition(0, 0);
+                }
+            });
+        }
+        return mRedirectInProcess.get();
+    }
+
+    private Intent getRedirectionIntent(boolean noAnimation) {
+        Account pendingAccount = xmppConnectionService.getPendingAccount();
+        Intent intent;
+        if (pendingAccount != null) {
+            intent = new Intent(this, EditAccountActivity.class);
+            intent.putExtra("jid", pendingAccount.getJid().asBareJid().toString());
+        } else {
+            if (xmppConnectionService.getAccounts().size() == 0) {
+                if (Config.X509_VERIFICATION) {
+                    intent = new Intent(this, ManageAccountActivity.class);
+                } else if (Config.MAGIC_CREATE_DOMAIN != null) {
+                    intent = new Intent(this, WelcomeActivity.class);
+                    WelcomeActivity.addInviteUri(intent, getIntent());
+                } else {
+                    intent = new Intent(this, EditAccountActivity.class);
+                }
+            } else {
+                intent = new Intent(this, StartConversationActivity.class);
+            }
+        }
+        intent.putExtra("init", true);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        if (noAnimation) {
+            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+        }
+        return intent;
+    }
+
+    private void showDialogsIfMainIsOverview() {
+        if (xmppConnectionService == null) {
+            return;
+        }
+        final Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+        if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
+            if (ExceptionHelper.checkForCrash(this)) {
+                return;
+            }
+            openBatteryOptimizationDialogIfNeeded();
+        }
+    }
+
+    private String getBatteryOptimizationPreferenceKey() {
+        @SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+        return "show_battery_optimization" + (device == null ? "" : device);
+    }
+
+    private void setNeverAskForBatteryOptimizationsAgain() {
+        getPreferences().edit().putBoolean(getBatteryOptimizationPreferenceKey(), false).apply();
+    }
+
+    private void openBatteryOptimizationDialogIfNeeded() {
+        if (hasAccountWithoutPush()
+                && isOptimizingBattery()
+                && getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.battery_optimizations_enabled);
+            builder.setMessage(R.string.battery_optimizations_enabled_dialog);
+            builder.setPositiveButton(R.string.next, (dialog, which) -> {
+                Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                Uri uri = Uri.parse("package:" + getPackageName());
+                intent.setData(uri);
+                try {
+                    startActivityForResult(intent, REQUEST_BATTERY_OP);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
+                }
+            });
+            builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
+            final AlertDialog dialog = builder.create();
+            dialog.setCanceledOnTouchOutside(false);
+            dialog.show();
+        }
+    }
+
+    private boolean hasAccountWithoutPush() {
+        for (Account account : xmppConnectionService.getAccounts()) {
+            if (account.getStatus() == Account.State.ONLINE && !xmppConnectionService.getPushManagementService().available(account)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void notifyFragmentOfBackendConnected(@IdRes int id) {
+        final Fragment fragment = getFragmentManager().findFragmentById(id);
+        if (fragment != null && fragment instanceof OnBackendConnected) {
+            ((OnBackendConnected) fragment).onBackendConnected();
+        }
+    }
+
+    private void refreshFragment(@IdRes int id) {
+        final Fragment fragment = getFragmentManager().findFragmentById(id);
+        if (fragment != null && fragment instanceof XmppFragment) {
+            ((XmppFragment) fragment).refresh();
+        }
+    }
+
+    private boolean processViewIntent(Intent intent) {
+        String uuid = intent.getStringExtra(EXTRA_CONVERSATION);
+        Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null;
+        if (conversation == null) {
+            Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid);
+            return false;
+        }
+        openConversation(conversation, intent.getExtras());
+        return true;
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+        UriHandlerActivity.onRequestPermissionResult(this, requestCode, grantResults);
+        if (grantResults.length > 0) {
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                switch (requestCode) {
+                    case REQUEST_OPEN_MESSAGE:
+                        refreshUiReal();
+                        ConversationFragment.openPendingMessage(this);
+                        break;
+                    case REQUEST_PLAY_PAUSE:
+                        ConversationFragment.startStopPending(this);
+                        break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        ActivityResult activityResult = ActivityResult.of(requestCode, resultCode, data);
+        if (xmppConnectionService != null) {
+            handleActivityResult(activityResult);
+        } else {
+            this.postponedActivityResult.push(activityResult);
+        }
+    }
+
+    private void handleActivityResult(ActivityResult activityResult) {
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            handlePositiveActivityResult(activityResult.requestCode, activityResult.data);
+        } else {
+            handleNegativeActivityResult(activityResult.requestCode);
+        }
+    }
+
+    private void handleNegativeActivityResult(int requestCode) {
+        Conversation conversation = ConversationFragment.getConversationReliable(this);
+        switch (requestCode) {
+            case REQUEST_DECRYPT_PGP:
+                if (conversation == null) {
+                    break;
+                }
+                conversation.getAccount().getPgpDecryptionService().giveUpCurrentDecryption();
+                break;
+            case REQUEST_BATTERY_OP:
+                setNeverAskForBatteryOptimizationsAgain();
+                break;
+        }
+    }
+
+    private void handlePositiveActivityResult(int requestCode, final Intent data) {
+        Conversation conversation = ConversationFragment.getConversationReliable(this);
+        if (conversation == null) {
+            Log.d(Config.LOGTAG, "conversation not found");
+            return;
+        }
+        switch (requestCode) {
+            case REQUEST_DECRYPT_PGP:
+                conversation.getAccount().getPgpDecryptionService().continueDecryption(data);
+                break;
+            case REQUEST_CHOOSE_PGP_ID:
+                long id = data.getLongExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, 0);
+                if (id != 0) {
+                    conversation.getAccount().setPgpSignId(id);
+                    announcePgp(conversation.getAccount(), null, null, onOpenPGPKeyPublished);
+                } else {
+                    choosePgpSignId(conversation.getAccount());
+                }
+                break;
+            case REQUEST_ANNOUNCE_PGP:
+                announcePgp(conversation.getAccount(), conversation, data, onOpenPGPKeyPublished);
+                break;
+        }
+    }
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ConversationMenuConfigurator.reloadFeatures(this);
+        OmemoSetting.load(this);
+        new EmojiService(this).init();
+        this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations);
+        setSupportActionBar((Toolbar) binding.toolbar);
+        configureActionBar(getSupportActionBar());
+        this.getFragmentManager().addOnBackStackChangedListener(this::invalidateActionBarTitle);
+        this.getFragmentManager().addOnBackStackChangedListener(this::showDialogsIfMainIsOverview);
+        this.initializeFragments();
+        this.invalidateActionBarTitle();
+        final Intent intent;
+        if (savedInstanceState == null) {
+            intent = getIntent();
+        } else {
+            intent = savedInstanceState.getParcelable("intent");
+        }
+        if (isViewOrShareIntent(intent)) {
+            pendingViewIntent.push(intent);
+            setIntent(createLauncherIntent(this));
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.activity_conversations, menu);
+        MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
+        if (qrCodeScanMenuItem != null) {
+            if (isCameraFeatureAvailable()) {
+                Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+                boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
+                        && fragment != null
+                        && fragment instanceof ConversationsOverviewFragment;
+                qrCodeScanMenuItem.setVisible(visible);
+            } else {
+                qrCodeScanMenuItem.setVisible(false);
+            }
+        }
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public void onConversationSelected(Conversation conversation) {
+        clearPendingViewIntent();
+        if (ConversationFragment.getConversation(this) == conversation) {
+            Log.d(Config.LOGTAG, "ignore onConversationSelected() because conversation is already open");
+            return;
+        }
+        openConversation(conversation, null);
+    }
+
+    public void clearPendingViewIntent() {
+        if (pendingViewIntent.clear()) {
+            Log.e(Config.LOGTAG, "cleared pending view intent");
+        }
+    }
 
     private void displayToast(final String msg) {
         runOnUiThread(() -> Toast.makeText(ConversationsActivity.this, msg, Toast.LENGTH_SHORT).show());
@@ -449,247 +456,247 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         displayToast(getString(resId, nick));
     }
 
-	private void openConversation(Conversation conversation, Bundle extras) {
-		ConversationFragment conversationFragment = (ConversationFragment) getFragmentManager().findFragmentById(R.id.secondary_fragment);
-		final boolean mainNeedsRefresh;
-		if (conversationFragment == null) {
-			mainNeedsRefresh = false;
-			Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-			if (mainFragment != null && mainFragment instanceof ConversationFragment) {
-				conversationFragment = (ConversationFragment) mainFragment;
-			} else {
-				conversationFragment = new ConversationFragment();
-				FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-				fragmentTransaction.replace(R.id.main_fragment, conversationFragment);
-				fragmentTransaction.addToBackStack(null);
-				try {
-					fragmentTransaction.commit();
-				} catch (IllegalStateException e) {
-					Log.w(Config.LOGTAG,"sate loss while opening conversation",e);
-					//allowing state loss is probably fine since view intents et all are already stored and a click can probably be 'ignored'
-					return;
-				}
-			}
-		} else {
-			mainNeedsRefresh = true;
-		}
-		conversationFragment.reInit(conversation, extras == null ? new Bundle() : extras);
-		if (mainNeedsRefresh) {
-			refreshFragment(R.id.main_fragment);
-		} else {
-			invalidateActionBarTitle();
-		}
-	}
-
-	public boolean onXmppUriClicked(Uri uri) {
-		XmppUri xmppUri = new XmppUri(uri);
-		if (xmppUri.isJidValid() && !xmppUri.hasFingerprints()) {
-			final Conversation conversation = xmppConnectionService.findUniqueConversationByJid(xmppUri);
-			if (conversation != null) {
-				openConversation(conversation, null);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (MenuDoubleTabUtil.shouldIgnoreTap()) {
-			return false;
-		}
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				FragmentManager fm = getFragmentManager();
-				if (fm.getBackStackEntryCount() > 0) {
-					try {
-						fm.popBackStack();
-					} catch (IllegalStateException e) {
-						Log.w(Config.LOGTAG,"Unable to pop back stack after pressing home button");
-					}
-					return true;
-				}
-				break;
-			case R.id.action_scan_qr_code:
-				UriHandlerActivity.scan(this);
-				return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	public void onSaveInstanceState(Bundle savedInstanceState) {
-		Intent pendingIntent = pendingViewIntent.peek();
-		savedInstanceState.putParcelable("intent", pendingIntent != null ? pendingIntent : getIntent());
-		super.onSaveInstanceState(savedInstanceState);
-	}
-
-	@Override
-	protected void onStart() {
-		final int theme = findTheme();
-		if (this.mTheme != theme) {
-			this.mSkipBackgroundBinding = true;
-			recreate();
-		} else {
-			this.mSkipBackgroundBinding = false;
-		}
-		mRedirectInProcess.set(false);
-		super.onStart();
-	}
-
-	@Override
-	protected void onNewIntent(final Intent intent) {
-		if (isViewOrShareIntent(intent)) {
-			if (xmppConnectionService != null) {
-				processViewIntent(intent);
-			} else {
-				pendingViewIntent.push(intent);
-			}
-		}
-		setIntent(createLauncherIntent(this));
-	}
-
-	@Override
-	public void onPause() {
-		this.mActivityPaused = true;
-		super.onPause();
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		this.mActivityPaused = false;
-	}
-
-	private void initializeFragments() {
-		FragmentTransaction transaction = getFragmentManager().beginTransaction();
-		Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-		Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
-		if (mainFragment != null) {
-			if (binding.secondaryFragment != null) {
-				if (mainFragment instanceof ConversationFragment) {
-					getFragmentManager().popBackStack();
-					transaction.remove(mainFragment);
-					transaction.commit();
-					getFragmentManager().executePendingTransactions();
-					transaction = getFragmentManager().beginTransaction();
-					transaction.replace(R.id.secondary_fragment, mainFragment);
-					transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
-					transaction.commit();
-					return;
-				}
-			} else {
-				if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
-					transaction.remove(secondaryFragment);
-					transaction.commit();
-					getFragmentManager().executePendingTransactions();
-					transaction = getFragmentManager().beginTransaction();
-					transaction.replace(R.id.main_fragment, secondaryFragment);
-					transaction.addToBackStack(null);
-					transaction.commit();
-					return;
-				}
-			}
-		} else {
-			transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
-		}
-		if (binding.secondaryFragment != null && secondaryFragment == null) {
-			transaction.replace(R.id.secondary_fragment, new ConversationFragment());
-		}
-		transaction.commit();
-	}
-
-	private void invalidateActionBarTitle() {
-		final ActionBar actionBar = getSupportActionBar();
-		if (actionBar != null) {
-			Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-			if (mainFragment != null && mainFragment instanceof ConversationFragment) {
-				final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
-				if (conversation != null) {
-					actionBar.setTitle(EmojiWrapper.transform(conversation.getName()));
-					actionBar.setDisplayHomeAsUpEnabled(true);
-					return;
-				}
-			}
-			actionBar.setTitle(R.string.app_name);
-			actionBar.setDisplayHomeAsUpEnabled(false);
-		}
-	}
-
-	@Override
-	public void onConversationArchived(Conversation conversation) {
-		if (performRedirectIfNecessary(conversation, false)) {
-			return;
-		}
-		Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-		if (mainFragment != null && mainFragment instanceof ConversationFragment) {
-			try {
-				getFragmentManager().popBackStack();
-			} catch (IllegalStateException e) {
-				Log.w(Config.LOGTAG,"state loss while popping back state after archiving conversation",e);
-				//this usually means activity is no longer active; meaning on the next open we will run through this again
-			}
-			return;
-		}
-		Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
-		if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
-			if (((ConversationFragment) secondaryFragment).getConversation() == conversation) {
-				Conversation suggestion = ConversationsOverviewFragment.getSuggestion(this, conversation);
-				if (suggestion != null) {
-					openConversation(suggestion, null);
-				}
-			}
-		}
-	}
-
-	@Override
-	public void onConversationsListItemUpdated() {
-		Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-		if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
-			((ConversationsOverviewFragment) fragment).refresh();
-		}
-	}
-
-	@Override
-	public void switchToConversation(Conversation conversation) {
-		Log.d(Config.LOGTAG, "override");
-		openConversation(conversation, null);
-	}
-
-	@Override
-	public void onConversationRead(Conversation conversation, String upToUuid) {
-		if (!mActivityPaused && pendingViewIntent.peek() == null) {
-			xmppConnectionService.sendReadMarker(conversation, upToUuid);
-		} else {
-			Log.d(Config.LOGTAG, "ignoring read callback. mActivityPaused=" + Boolean.toString(mActivityPaused));
-		}
-	}
-
-	@Override
-	public void onAccountUpdate() {
-		this.refreshUi();
-	}
-
-	@Override
-	public void onConversationUpdate() {
-		if (performRedirectIfNecessary(false)) {
-			return;
-		}
-		this.refreshUi();
-	}
-
-	@Override
-	public void onRosterUpdate() {
-		this.refreshUi();
-	}
-
-	@Override
-	public void OnUpdateBlocklist(OnUpdateBlocklist.Status status) {
-		this.refreshUi();
-	}
-
-	@Override
-	public void onShowErrorToast(int resId) {
-		runOnUiThread(() -> Toast.makeText(this, resId, Toast.LENGTH_SHORT).show());
-	}
+    private void openConversation(Conversation conversation, Bundle extras) {
+        ConversationFragment conversationFragment = (ConversationFragment) getFragmentManager().findFragmentById(R.id.secondary_fragment);
+        final boolean mainNeedsRefresh;
+        if (conversationFragment == null) {
+            mainNeedsRefresh = false;
+            Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+            if (mainFragment != null && mainFragment instanceof ConversationFragment) {
+                conversationFragment = (ConversationFragment) mainFragment;
+            } else {
+                conversationFragment = new ConversationFragment();
+                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+                fragmentTransaction.replace(R.id.main_fragment, conversationFragment);
+                fragmentTransaction.addToBackStack(null);
+                try {
+                    fragmentTransaction.commit();
+                } catch (IllegalStateException e) {
+                    Log.w(Config.LOGTAG, "sate loss while opening conversation", e);
+                    //allowing state loss is probably fine since view intents et all are already stored and a click can probably be 'ignored'
+                    return;
+                }
+            }
+        } else {
+            mainNeedsRefresh = true;
+        }
+        conversationFragment.reInit(conversation, extras == null ? new Bundle() : extras);
+        if (mainNeedsRefresh) {
+            refreshFragment(R.id.main_fragment);
+        } else {
+            invalidateActionBarTitle();
+        }
+    }
+
+    public boolean onXmppUriClicked(Uri uri) {
+        XmppUri xmppUri = new XmppUri(uri);
+        if (xmppUri.isJidValid() && !xmppUri.hasFingerprints()) {
+            final Conversation conversation = xmppConnectionService.findUniqueConversationByJid(xmppUri);
+            if (conversation != null) {
+                openConversation(conversation, null);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (MenuDoubleTabUtil.shouldIgnoreTap()) {
+            return false;
+        }
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                FragmentManager fm = getFragmentManager();
+                if (fm.getBackStackEntryCount() > 0) {
+                    try {
+                        fm.popBackStack();
+                    } catch (IllegalStateException e) {
+                        Log.w(Config.LOGTAG, "Unable to pop back stack after pressing home button");
+                    }
+                    return true;
+                }
+                break;
+            case R.id.action_scan_qr_code:
+                UriHandlerActivity.scan(this);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        Intent pendingIntent = pendingViewIntent.peek();
+        savedInstanceState.putParcelable("intent", pendingIntent != null ? pendingIntent : getIntent());
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
+    @Override
+    protected void onStart() {
+        final int theme = findTheme();
+        if (this.mTheme != theme) {
+            this.mSkipBackgroundBinding = true;
+            recreate();
+        } else {
+            this.mSkipBackgroundBinding = false;
+        }
+        mRedirectInProcess.set(false);
+        super.onStart();
+    }
+
+    @Override
+    protected void onNewIntent(final Intent intent) {
+        if (isViewOrShareIntent(intent)) {
+            if (xmppConnectionService != null) {
+                processViewIntent(intent);
+            } else {
+                pendingViewIntent.push(intent);
+            }
+        }
+        setIntent(createLauncherIntent(this));
+    }
+
+    @Override
+    public void onPause() {
+        this.mActivityPaused = true;
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        this.mActivityPaused = false;
+    }
+
+    private void initializeFragments() {
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+        Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
+        if (mainFragment != null) {
+            if (binding.secondaryFragment != null) {
+                if (mainFragment instanceof ConversationFragment) {
+                    getFragmentManager().popBackStack();
+                    transaction.remove(mainFragment);
+                    transaction.commit();
+                    getFragmentManager().executePendingTransactions();
+                    transaction = getFragmentManager().beginTransaction();
+                    transaction.replace(R.id.secondary_fragment, mainFragment);
+                    transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
+                    transaction.commit();
+                    return;
+                }
+            } else {
+                if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
+                    transaction.remove(secondaryFragment);
+                    transaction.commit();
+                    getFragmentManager().executePendingTransactions();
+                    transaction = getFragmentManager().beginTransaction();
+                    transaction.replace(R.id.main_fragment, secondaryFragment);
+                    transaction.addToBackStack(null);
+                    transaction.commit();
+                    return;
+                }
+            }
+        } else {
+            transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
+        }
+        if (binding.secondaryFragment != null && secondaryFragment == null) {
+            transaction.replace(R.id.secondary_fragment, new ConversationFragment());
+        }
+        transaction.commit();
+    }
+
+    private void invalidateActionBarTitle() {
+        final ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+            if (mainFragment != null && mainFragment instanceof ConversationFragment) {
+                final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
+                if (conversation != null) {
+                    actionBar.setTitle(EmojiWrapper.transform(conversation.getName()));
+                    actionBar.setDisplayHomeAsUpEnabled(true);
+                    return;
+                }
+            }
+            actionBar.setTitle(R.string.app_name);
+            actionBar.setDisplayHomeAsUpEnabled(false);
+        }
+    }
+
+    @Override
+    public void onConversationArchived(Conversation conversation) {
+        if (performRedirectIfNecessary(conversation, false)) {
+            return;
+        }
+        Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+        if (mainFragment != null && mainFragment instanceof ConversationFragment) {
+            try {
+                getFragmentManager().popBackStack();
+            } catch (IllegalStateException e) {
+                Log.w(Config.LOGTAG, "state loss while popping back state after archiving conversation", e);
+                //this usually means activity is no longer active; meaning on the next open we will run through this again
+            }
+            return;
+        }
+        Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
+        if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
+            if (((ConversationFragment) secondaryFragment).getConversation() == conversation) {
+                Conversation suggestion = ConversationsOverviewFragment.getSuggestion(this, conversation);
+                if (suggestion != null) {
+                    openConversation(suggestion, null);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onConversationsListItemUpdated() {
+        Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+        if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
+            ((ConversationsOverviewFragment) fragment).refresh();
+        }
+    }
+
+    @Override
+    public void switchToConversation(Conversation conversation) {
+        Log.d(Config.LOGTAG, "override");
+        openConversation(conversation, null);
+    }
+
+    @Override
+    public void onConversationRead(Conversation conversation, String upToUuid) {
+        if (!mActivityPaused && pendingViewIntent.peek() == null) {
+            xmppConnectionService.sendReadMarker(conversation, upToUuid);
+        } else {
+            Log.d(Config.LOGTAG, "ignoring read callback. mActivityPaused=" + Boolean.toString(mActivityPaused));
+        }
+    }
+
+    @Override
+    public void onAccountUpdate() {
+        this.refreshUi();
+    }
+
+    @Override
+    public void onConversationUpdate() {
+        if (performRedirectIfNecessary(false)) {
+            return;
+        }
+        this.refreshUi();
+    }
+
+    @Override
+    public void onRosterUpdate() {
+        this.refreshUi();
+    }
+
+    @Override
+    public void OnUpdateBlocklist(OnUpdateBlocklist.Status status) {
+        this.refreshUi();
+    }
+
+    @Override
+    public void onShowErrorToast(int resId) {
+        runOnUiThread(() -> Toast.makeText(this, resId, Toast.LENGTH_SHORT).show());
+    }
 }