Revert "Add first time wizard for sync settings"

This reverts commit cd601988db41f7651f376ef419be3dd50aaa4e10.

3 files changed, 4 insertions, 78 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
deleted file mode 100644
index e8c3cdb0c..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.ui;
-
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.ui.base.BaseActivity;
-
-public class FirstTimeActivity extends BaseActivity {
-
-    public static final String FRAGMENT_TAG = "currentFragment";
-
-    Fragment mCurrentFragment;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Check whether we're recreating a previously destroyed instance
-        if (savedInstanceState != null) {
-            // Restore value of members from saved state
-
-            mCurrentFragment = getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
-        } else {
-
-            // Add the sync fragment
-            SettingsActivity.SyncPrefsFragment frag = new SettingsActivity.SyncPrefsFragment();
-            FragmentTransaction transaction = getFragmentManager().beginTransaction();
-            transaction.setCustomAnimations(0, 0);
-            transaction.replace(R.id.first_time_fragment_container, frag, FRAGMENT_TAG)
-                    .commit();
-            getSupportFragmentManager().executePendingTransactions();
-        }
-
-        setTitle(R.string.app_name);
-        mToolbar.setNavigationIcon(null);
-        mToolbar.setNavigationOnClickListener(null);
-
-        View nextButton = findViewById(R.id.first_time_next_button);
-        nextButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(FirstTimeActivity.this,
-                        CreateKeyActivity.class);
-                intent.putExtra(CreateKeyActivity.EXTRA_FIRST_TIME, true);
-                startActivity(intent);
-                finish();
-            }
-        });
-    }
-
-    @Override
-    protected void initLayout() {
-        setContentView(R.layout.first_time_activity);
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index 8ee3a0d69..db31bd0a1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -492,7 +492,8 @@ public class KeyListFragment extends LoaderFragment
             case R.id.menu_key_list_debug_first_time:
                 Preferences prefs = Preferences.getPreferences(getActivity());
                 prefs.setFirstTime(true);
-                Intent intent = new Intent(getActivity(), FirstTimeActivity.class);
+                Intent intent = new Intent(getActivity(), CreateKeyActivity.class);
+                intent.putExtra(CreateKeyActivity.EXTRA_FIRST_TIME, true);
                 startActivity(intent);
                 getActivity().finish();
                 return true;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index 1d64f568f..7bd7bafcc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -126,7 +126,8 @@ public class MainActivity extends BaseNfcActivity implements FabContainer, OnBac
         // if this is the first time show first time activity
         Preferences prefs = Preferences.getPreferences(this);
         if (!getIntent().getBooleanExtra(EXTRA_SKIP_FIRST_TIME, false) && prefs.isFirstTime()) {
-            Intent intent = new Intent(this, FirstTimeActivity.class);
+            Intent intent = new Intent(this, CreateKeyActivity.class);
+            intent.putExtra(CreateKeyActivity.EXTRA_FIRST_TIME, true);
             startActivity(intent);
             finish();
             return;