From eced1dd314ba651f862396c340492c6f2d9da926 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Fri, 14 Aug 2015 17:35:43 -0400
Subject: Move UI things to UI thread

---
 app/src/main/java/com/zeapo/pwdstore/UserPreference.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/UserPreference.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
index 285f2316..9a5c83d4 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -86,7 +86,7 @@ public class UserPreference extends AppCompatActivity {
             findPreference("ssh_keygen").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    callingActivity.makeSshKey();
+                    callingActivity.makeSshKey(true);
                     return true;
                 }
             });
@@ -202,7 +202,7 @@ public class UserPreference extends AppCompatActivity {
                         getSshKey();
                         break;
                     case "make_ssh_key":
-                        makeSshKey();
+                        makeSshKey(false);
                         break;
                     case "git_external":
                         selectExternalGitRepository();
@@ -252,11 +252,13 @@ public class UserPreference extends AppCompatActivity {
     /**
      * Opens a key generator to generate a public/private key pair
      */
-    public void makeSshKey() {
+    public void makeSshKey(boolean fromPreferences) {
         Intent intent = new Intent(getApplicationContext(), SshKeyGen.class);
         startActivity(intent);
-        setResult(RESULT_OK);
-        finish();
+        if (!fromPreferences) {
+            setResult(RESULT_OK);
+            finish();
+        }
     }
 
     private void copySshKey(Uri uri) throws IOException {
-- 
cgit v1.2.3