Move key list logic into fragment, UI fixes for nav drawer

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index 04a932658..b3b433a63 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -20,11 +20,10 @@ package org.sufficientlysecure.keychain;
 import android.os.Environment;
 
 import org.spongycastle.jce.provider.BouncyCastleProvider;
-import org.sufficientlysecure.keychain.remote.ui.AppsListActivity;
 import org.sufficientlysecure.keychain.ui.DecryptActivity;
 import org.sufficientlysecure.keychain.ui.EncryptFilesActivity;
 import org.sufficientlysecure.keychain.ui.EncryptTextActivity;
-import org.sufficientlysecure.keychain.ui.KeyListActivity;
+import org.sufficientlysecure.keychain.ui.MainActivity;
 
 import java.io.File;
 
@@ -92,11 +91,11 @@ public final class Constants {
     }
 
     public static final class DrawerItems {
-        public static final Class KEY_LIST = KeyListActivity.class;
+        public static final Class KEY_LIST = MainActivity.class;
         public static final Class ENCRYPT_TEXT = EncryptTextActivity.class;
         public static final Class ENCRYPT_FILE = EncryptFilesActivity.class;
         public static final Class DECRYPT = DecryptActivity.class;
-        public static final Class REGISTERED_APPS_LIST = AppsListActivity.class;
+        public static final Class REGISTERED_APPS_LIST = MainActivity.class;
         public static final Class[] ARRAY = new Class[]{
                 KEY_LIST,
                 ENCRYPT_TEXT,