always show MainActivity after first-time CreateKeyActivity

1 files changed, 2 insertions, 12 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java
index cd97ef108..68ec0e8c8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyStartFragment.java
@@ -98,17 +98,10 @@ public class CreateKeyStartFragment extends Fragment {
         mSkipOrCancel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (mCreateKeyActivity.mFirstTime) {
-                    Preferences prefs = Preferences.getPreferences(mCreateKeyActivity);
-                    prefs.setFirstTime(false);
-                    Intent intent = new Intent(mCreateKeyActivity, MainActivity.class);
-                    startActivity(intent);
-                    mCreateKeyActivity.finish();
-                } else {
-                    // just finish activity and return data
+                if (!mCreateKeyActivity.mFirstTime) {
                     mCreateKeyActivity.setResult(Activity.RESULT_CANCELED);
-                    mCreateKeyActivity.finish();
                 }
+                mCreateKeyActivity.finish();
             }
         });
 
@@ -124,9 +117,6 @@ public class CreateKeyStartFragment extends Fragment {
                 if (mCreateKeyActivity.mFirstTime) {
                     Preferences prefs = Preferences.getPreferences(mCreateKeyActivity);
                     prefs.setFirstTime(false);
-                    Intent intent = new Intent(mCreateKeyActivity, MainActivity.class);
-                    intent.putExtras(data);
-                    startActivity(intent);
                     mCreateKeyActivity.finish();
                 } else {
                     // just finish activity and return data