Revert "Cleanup"

This reverts commit 1d264dc971.

FAQ.md

@@ -468,6 +468,14 @@ Since encrypting passwords would require a secret and the background service nee
 Storing a secret together with encrypted passwords would not add anything, so passwords are stored in plain text in a safe, inaccessible place.
 Recent Android versions encrypt all data anyway.
 
+<a name="faq38"></a>
+**(38) Why can't I select a (settings) file?**
+
+Normally the Android [storage access framework](https://developer.android.com/guide/topics/providers/document-provider) is used to select files and folder.
+However, some file explorers can be used to select files and folders too
+in which case you get a choice which app to use to select the file or folder and the choice to do this once or always.
+On some Android versions selecting 'once' results in the file/folder selection to be canceled, so you will need to select 'always' for the file/folder selection to work.
+
 ## Support
 
 If you have another question, want to request a feature or report a bug, you can use [this forum](https://forum.xda-developers.com/android/apps-games/source-email-t3824168).

app/src/main/java/eu/faircode/email/FragmentSetup.java

@@ -454,22 +454,22 @@ public class FragmentSetup extends FragmentEx {
 
                                 String password1 = etPassword1.getText().toString();
                                 String password2 = etPassword2.getText().toString();
-
-                                if (TextUtils.isEmpty(password1))
-                                    Snackbar.make(view, R.string.title_setup_password_missing, Snackbar.LENGTH_LONG).show();
-                                else {
-                                    if (password1.equals(password2)) {
+                                if (password1.equals(password2))
+                                    if (TextUtils.isEmpty(password1))
+                                        Snackbar.make(view, R.string.title_canceled, Snackbar.LENGTH_LONG).show();
+                                    else {
                                         if (requestCode == ActivitySetup.REQUEST_EXPORT)
                                             handleExport(data, password1);
                                         else
                                             handleImport(data, password1);
-                                    } else
-                                        Snackbar.make(view, R.string.title_setup_password_different, Snackbar.LENGTH_LONG).show();
-                                }
+                                    }
+                                else
+                                    Snackbar.make(view, R.string.title_setup_password_different, Snackbar.LENGTH_LONG).show();
                             }
                         })
                         .show();
-            }
+            } else
+                Snackbar.make(view, R.string.title_canceled, Snackbar.LENGTH_LONG).show();
     }
 
     private void onMenuPrivacy() {

app/src/main/res/values/strings.xml

@@ -73,7 +73,6 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
-    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
     <string name="title_setup_exported">Settings exported</string>
     <string name="title_setup_imported">Settings imported</string>
@@ -326,6 +325,7 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
+    <string name="title_canceled">Canceled</string>
 
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>