Merge pull request #9431 from nextcloud/showMnemonic

show mnemonic only if requested

src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -61,7 +61,6 @@ import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
 import com.owncloud.android.datamodel.ExternalLinksProvider;
 import com.owncloud.android.datastorage.DataStorageProvider;
@@ -118,6 +117,7 @@ public class SettingsActivity extends ThemedPreferenceActivity
     private static final int ACTION_CONFIRM_PASSCODE = 6;
     private static final int ACTION_CONFIRM_DEVICE_CREDENTIALS = 7;
     private static final int ACTION_REQUEST_CODE_DAVDROID_SETUP = 10;
+    private static final int ACTION_SHOW_MNEMONIC = 11;
     private static final int TRUE_VALUE = 1;
 
     private static final String DAV_PATH = "/remote.php/dav";
@@ -425,7 +425,7 @@ public class SettingsActivity extends ThemedPreferenceActivity
 
                         Intent i = new Intent(MainApp.getAppContext(), RequestCredentialsActivity.class);
                         i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-                        startActivityForResult(i, PassCodeManager.PASSCODE_ACTIVITY);
+                        startActivityForResult(i, ACTION_SHOW_MNEMONIC);
 
                         return true;
                     });
@@ -855,7 +855,7 @@ public class SettingsActivity extends ThemedPreferenceActivity
             if (!LOCK_NONE.equals(pendingLock)) {
                 enableLock(pendingLock);
             }
-        } else if (requestCode == PassCodeManager.PASSCODE_ACTIVITY) {
+        } else if (requestCode == ACTION_SHOW_MNEMONIC && resultCode == RESULT_OK) {
             handleMnemonicRequest(data);
         }
     }