fix tests

Author: maxistar

app/src/androidTest/java/com/maxistar/textpad/test/EditorRecoveryTest.java

@@ -4,6 +4,7 @@
 import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.RootMatchers.isDialog;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.junit.Assert.assertEquals;
@@ -106,6 +107,7 @@ public void changedUntitledDocumentCanBeRestoredAfterRecreation() {
                 editor.setText(content);
                 editor.setSelection(1234);
             });
+            android.os.SystemClock.sleep(800);
 
             scenario.recreate();
             onView(withText(R.string.Restore)).perform(click());
@@ -145,13 +147,15 @@ public void pendingRecoveryDecisionCannotOverwriteDraftDuringRecreation() throws
         String content = "recoverable after recreation";
         try (ActivityScenario<EditorActivity> scenario = ActivityScenario.launch(EditorActivity.class)) {
             scenario.onActivity(activity -> ((EditText) activity.findViewById(R.id.editText1)).setText(content));
+            Thread.sleep(800);
             scenario.recreate();
-            onView(withText(R.string.Restore)).check(matches(androidx.test.espresso.matcher.ViewMatchers.isDisplayed()));
+            onView(withText(R.string.Restore)).inRoot(isDialog())
+                    .check(matches(androidx.test.espresso.matcher.ViewMatchers.isDisplayed()));
             pressBack();
             scenario.moveToState(Lifecycle.State.CREATED);
             scenario.moveToState(Lifecycle.State.RESUMED);
             assertEquals(content, new RecoveryRepository(context).loadActive().text);
-            onView(withText(R.string.Restore)).perform(click());
+            onView(withText(R.string.Restore)).inRoot(isDialog()).perform(click());
             onView(withId(R.id.editText1)).check(matches(withText(content)));
         }
     }

app/src/main/java/com/maxistar/textpad/activities/EditorActivity.java

@@ -151,6 +151,9 @@ public class EditorActivity extends AppCompatActivity {
     private long editorGeneration = 0;
     private boolean suppressRecoveryTracking = false;
     private boolean recoveryDecisionPending = false;
+    private boolean recoveryDialogShowing = false;
+    private RecoveryDraft pendingRecoveryDraft;
+    private Runnable pendingRecoveryDiscardLoader;
     private Long originalSize;
     private Long originalLastModified;
     private String originalContentSha256;
@@ -382,6 +385,10 @@ protected void onResume() {
             });
         }
 
+        if (recoveryDecisionPending && !recoveryDialogShowing && pendingRecoveryDraft != null) {
+            mText.post(this::showPendingRecoveryDialog);
+        }
+
         if (SettingsService.isLanguageWasChanged()) {
             Intent intent = getIntent();
             finish();
@@ -460,6 +467,9 @@ private void offerActiveUntitledRecovery() {
 
     private void showRecoveryDialog(RecoveryDraft draft, Runnable discardLoader) {
         recoveryDecisionPending = true;
+        pendingRecoveryDraft = draft;
+        pendingRecoveryDiscardLoader = discardLoader;
+        recoveryDialogShowing = true;
         String timestamp = DateFormat.getDateTimeInstance().format(new Date(draft.metadata.draftUpdatedAt));
         String name = draft.metadata.displayName == null || draft.metadata.displayName.isEmpty()
                 ? TPStrings.NEW_FILE_TXT
@@ -469,19 +479,26 @@ private void showRecoveryDialog(RecoveryDraft draft, Runnable discardLoader) {
                 .setMessage(getString(R.string.Recovery_draft_message, name, timestamp))
                 .setPositiveButton(R.string.Restore, (dialog, which) -> restoreDraft(draft))
                 .setNegativeButton(R.string.Discard_draft, (dialog, which) -> {
-                    recoveryDecisionPending = false;
+                    clearPendingRecoveryDecision();
                     recoveryRepository.delete(draft.metadata.recoveryKey);
                     if (draft.metadata.recoveryKey.equals(recoveryKey)) {
                         recoveryKey = null;
                     }
                     discardLoader.run();
                 })
                 .setCancelable(false)
+                .setOnDismissListener(dialog -> recoveryDialogShowing = false)
                 .show();
     }
 
+    private void showPendingRecoveryDialog() {
+        if (recoveryDecisionPending && !recoveryDialogShowing && pendingRecoveryDraft != null) {
+            showRecoveryDialog(pendingRecoveryDraft, pendingRecoveryDiscardLoader);
+        }
+    }
+
     private void restoreDraft(RecoveryDraft draft) {
-        recoveryDecisionPending = false;
+        clearPendingRecoveryDecision();
         recoveryKey = draft.metadata.recoveryKey;
         urlFilename = draft.metadata.documentUri == null ? TPStrings.EMPTY : filenameFromIdentity(draft.metadata.documentUri);
         editorGeneration = draft.metadata.generation;
@@ -497,6 +514,12 @@ private void restoreDraft(RecoveryDraft draft) {
         }
     }
 
+    private void clearPendingRecoveryDecision() {
+        recoveryDecisionPending = false;
+        pendingRecoveryDraft = null;
+        pendingRecoveryDiscardLoader = null;
+    }
+
     private void applyStoredSelection() {
         int length = mText.length();
         int start = Math.max(0, Math.min(selectionStart, length));