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

20 files changed, 61 insertions, 360 deletions

diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index 0d7d688f2..652e3063a 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -13,4 +13,5 @@ python copy OpenKeychain communication black vpn_key 24
 python copy OpenKeychain action black lock_open 24
 python copy OpenKeychain action black lock_outline 24
 python copy OpenKeychain navigation black apps 24
-python copy OpenKeychain action black settings 24
\ No newline at end of file
+python copy OpenKeychain action black help 24
+python copy OpenKeychain action black settings 24
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,
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
index e5edd6a0f..f4cd553d0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java
@@ -92,9 +92,6 @@ public class AccountSettingsActivity extends BaseActivity {
             case R.id.menu_account_settings_delete:
                 deleteAccount();
                 return true;
-            case R.id.menu_account_settings_cancel:
-                finish();
-                return true;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
index e91482e28..36d6ad888 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java
@@ -47,13 +47,6 @@ public class AppSettingsActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        // let the actionbar look like Android's contact app
-//        ActionBar actionBar = getSupportActionBar();
-//        actionBar.setDisplayHomeAsUpEnabled(true);
-//        actionBar.setIcon(android.R.color.transparent);
-//        actionBar.setHomeButtonEnabled(true);
-
-
         mSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
                 R.id.api_app_settings_fragment);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java
deleted file mode 100644
index 3b4cc654e..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2013-2014 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.remote.ui;
-
-import android.os.Bundle;
-
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.ui.DrawerActivity;
-import org.sufficientlysecure.keychain.ui.NavDrawerActivity;
-
-public class AppsListActivity extends NavDrawerActivity {
-
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//
-//        activateDrawerNavigation(savedInstanceState);
-//    }
-
-    @Override
-    public void init(Bundle savedInstanceState) {
-        super.init(savedInstanceState);
-        setContentView(R.layout.api_apps_list_activity);
-    }
-
-
-//    @Override
-//    protected void initLayout() {
-//        setContentView(R.layout.api_apps_list_activity);
-//    }
-
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
index ce2a049f5..4e51c62d2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
@@ -92,7 +92,7 @@ public class FirstTimeActivity extends BaseActivity {
     private void finishSetup(Intent srcData) {
         Preferences prefs = Preferences.getPreferences(this);
         prefs.setFirstTime(false);
-        Intent intent = new Intent(this, KeyListActivity.class);
+        Intent intent = new Intent(this, MainActivity.class);
         // give intent through to display notify
         if (srcData != null) {
             intent.putExtras(srcData);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
deleted file mode 100644
index b7f3588eb..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
- *
- * 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.ProgressDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Message;
-import android.os.Messenger;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.operations.results.ConsolidateResult;
-import org.sufficientlysecure.keychain.operations.results.OperationResult;
-import org.sufficientlysecure.keychain.provider.KeychainContract;
-import org.sufficientlysecure.keychain.provider.KeychainDatabase;
-import org.sufficientlysecure.keychain.service.KeychainIntentService;
-import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
-import org.sufficientlysecure.keychain.ui.util.Notify;
-import org.sufficientlysecure.keychain.util.ExportHelper;
-import org.sufficientlysecure.keychain.util.Log;
-import org.sufficientlysecure.keychain.util.Preferences;
-
-import java.io.IOException;
-
-import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
-
-public class KeyListActivity extends NavDrawerActivity {
-
-    public static final int REQUEST_CODE_RESULT_TO_LIST = 1;
-
-    ExportHelper mExportHelper;
-
-    @Override
-//    public void onCreate(Bundle savedInstanceState) {
-    public void init(Bundle savedInstanceState) {
-        super.init(savedInstanceState);
-//        super.onCreate(savedInstanceState);
-//        setActionBarIcon(R.drawable.ic_ab_drawer);
-
-        setTitle(R.string.nav_keys);
-
-        // if this is the first time show first time activity
-        Preferences prefs = Preferences.getPreferences(this);
-        if (prefs.isFirstTime()) {
-            startActivity(new Intent(this, FirstTimeActivity.class));
-            finish();
-            return;
-        }
-
-        mExportHelper = new ExportHelper(this);
-
-        Intent data = getIntent();
-        // If we got an EXTRA_RESULT in the intent, show the notification
-        if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
-            OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
-            result.createNotify(this).show();
-        }
-
-        // now setup navigation drawer in DrawerActivity...
-//        activateDrawerNavigation(savedInstanceState);
-    }
-
-//    @Override
-//    protected void initLayout() {
-//        setContentView(R.layout.key_list_activity);
-//    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.key_list, menu);
-
-        if (Constants.DEBUG) {
-            menu.findItem(R.id.menu_key_list_debug_cons).setVisible(true);
-            menu.findItem(R.id.menu_key_list_debug_read).setVisible(true);
-            menu.findItem(R.id.menu_key_list_debug_write).setVisible(true);
-            menu.findItem(R.id.menu_key_list_debug_first_time).setVisible(true);
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_key_list_add:
-                Intent scanQrCode = new Intent(this, QrCodeScanActivity.class);
-                scanQrCode.setAction(QrCodeScanActivity.ACTION_SCAN_WITH_RESULT);
-                startActivityForResult(scanQrCode, 0);
-                return true;
-
-            case R.id.menu_key_list_search_cloud:
-                searchCloud();
-                return true;
-
-            case R.id.menu_key_list_create:
-                createKey();
-                return true;
-
-            case R.id.menu_key_list_import_existing_key:
-                Intent intentImportExisting = new Intent(this, ImportKeysActivity.class);
-                intentImportExisting.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN);
-                startActivityForResult(intentImportExisting, 0);
-                return true;
-
-            case R.id.menu_key_list_export:
-                mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true);
-                return true;
-
-            case R.id.menu_key_list_debug_cons:
-                consolidate();
-                return true;
-
-            case R.id.menu_key_list_debug_read:
-                try {
-                    KeychainDatabase.debugBackup(this, true);
-                    Notify.showNotify(this, "Restored debug_backup.db", Notify.Style.INFO);
-                    getContentResolver().notifyChange(KeychainContract.KeyRings.CONTENT_URI, null);
-                } catch (IOException e) {
-                    Log.e(Constants.TAG, "IO Error", e);
-                    Notify.showNotify(this, "IO Error " + e.getMessage(), Notify.Style.ERROR);
-                }
-                return true;
-
-            case R.id.menu_key_list_debug_write:
-                try {
-                    KeychainDatabase.debugBackup(this, false);
-                    Notify.showNotify(this, "Backup to debug_backup.db completed", Notify.Style.INFO);
-                } catch (IOException e) {
-                    Log.e(Constants.TAG, "IO Error", e);
-                    Notify.showNotify(this, "IO Error: " + e.getMessage(), Notify.Style.ERROR);
-                }
-                return true;
-
-            case R.id.menu_key_list_debug_first_time:
-                Preferences prefs = Preferences.getPreferences(this);
-                prefs.setFirstTime(true);
-                Intent intent = new Intent(this, FirstTimeActivity.class);
-                startActivity(intent);
-                finish();
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    private void searchCloud() {
-        Intent importIntent = new Intent(this, ImportKeysActivity.class);
-        importIntent.putExtra(ImportKeysActivity.EXTRA_QUERY, (String) null); // hack to show only cloud tab
-        startActivity(importIntent);
-    }
-
-    private void createKey() {
-        Intent intent = new Intent(this, CreateKeyActivity.class);
-        startActivityForResult(intent, 0);
-    }
-
-    private void consolidate() {
-        // Message is received after importing is done in KeychainIntentService
-        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(
-                this,
-                getString(R.string.progress_importing),
-                ProgressDialog.STYLE_HORIZONTAL) {
-            public void handleMessage(Message message) {
-                // handle messages by standard KeychainIntentServiceHandler first
-                super.handleMessage(message);
-
-                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
-                    // get returned data bundle
-                    Bundle returnData = message.getData();
-                    if (returnData == null) {
-                        return;
-                    }
-                    final ConsolidateResult result =
-                            returnData.getParcelable(OperationResult.EXTRA_RESULT);
-                    if (result == null) {
-                        return;
-                    }
-
-                    result.createNotify(KeyListActivity.this).show();
-                }
-            }
-        };
-
-        // Send all information needed to service to import key in other thread
-        Intent intent = new Intent(this, KeychainIntentService.class);
-
-        intent.setAction(KeychainIntentService.ACTION_CONSOLIDATE);
-
-        // fill values for this action
-        Bundle data = new Bundle();
-
-        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
-
-        // Create a new Messenger for the communication back
-        Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
-
-        // show progress dialog
-        saveHandler.showProgressDialog(this);
-
-        // start service with intent
-        startService(intent);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // if a result has been returned, display a notify
-        if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
-            OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
-            result.createNotify(this).show();
-        } else {
-            super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
new file mode 100644
index 000000000..f3bf337c9
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ * Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ *
+ * 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.content.Intent;
+import android.os.Bundle;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.operations.results.OperationResult;
+import org.sufficientlysecure.keychain.util.Preferences;
+
+public class MainActivity extends NavDrawerActivity {
+
+    @Override
+    public void init(Bundle savedInstanceState) {
+        super.init(savedInstanceState);
+
+        setTitle(R.string.nav_keys);
+
+        // if this is the first time show first time activity
+        Preferences prefs = Preferences.getPreferences(this);
+        if (prefs.isFirstTime()) {
+            startActivity(new Intent(this, FirstTimeActivity.class));
+            finish();
+            return;
+        }
+
+        Intent data = getIntent();
+        // If we got an EXTRA_RESULT in the intent, show the notification
+        if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) {
+            OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT);
+            result.createNotify(this).show();
+        }
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
index 5381b1ab3..57910af5e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
@@ -23,7 +23,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.remote.ui.AppsListActivity;
 import org.sufficientlysecure.keychain.remote.ui.AppsListFragment;
 
 import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
@@ -52,5 +51,6 @@ public abstract class NavDrawerActivity extends MaterialNavigationDrawer {
 
         // create bottom section
         addBottomSection(newSection(getString(R.string.menu_preferences), R.drawable.ic_settings_black_24dp, new Intent(this, SettingsActivity.class)));
+        addBottomSection(newSection(getString(R.string.menu_help), R.drawable.ic_help_black_24dp, new Intent(this, HelpActivity.class)));
     }
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
index f95644aff..d1df2906d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
@@ -163,7 +163,7 @@ public class SafeSlingerActivity extends BaseActivity {
                         certifyIntent.putExtra(CertifyKeyActivity.EXTRA_RESULT, result);
                         certifyIntent.putExtra(CertifyKeyActivity.EXTRA_KEY_IDS, result.getImportedMasterKeyIds());
                         certifyIntent.putExtra(CertifyKeyActivity.EXTRA_CERTIFY_KEY_ID, mMasterKeyId);
-                        startActivityForResult(certifyIntent, KeyListActivity.REQUEST_CODE_RESULT_TO_LIST);
+                        startActivityForResult(certifyIntent, 0);
 
 //                        mExchangeMasterKeyId = null;
                     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 3bb0695a0..575df01b7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -188,7 +188,7 @@ public class ViewKeyActivity extends BaseActivity implements
         try {
             switch (item.getItemId()) {
                 case android.R.id.home: {
-                    Intent homeIntent = new Intent(this, KeyListActivity.class);
+                    Intent homeIntent = new Intent(this, MainActivity.class);
                     homeIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
                     startActivity(homeIntent);
                     return true;
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..05be749c3
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..f3743dc20
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..87095ef26
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..f32d7e708
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
new file mode 100644
index 000000000..a4286b54c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_black_24dp.png
diff --git a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
deleted file mode 100644
index af06614b9..000000000
--- a/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-
-    <android.support.v4.widget.FixedDrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <include layout="@layout/drawer_list" />
-
-    </android.support.v4.widget.FixedDrawerLayout>
-
-    <include layout="@layout/api_apps_list_content" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
deleted file mode 100644
index df187e0a5..000000000
--- a/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <include layout="@layout/api_apps_list_content"/>
-
-    <include layout="@layout/drawer_list" />
-
-</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
deleted file mode 100644
index e1922079c..000000000
--- a/OpenKeychain/src/main/res/layout/api_apps_list_content.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/toolbar" />
-
-    <FrameLayout
-        android:layout_below="@id/toolbar"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/content_frame"
-        android:layout_marginLeft="@dimen/drawer_content_padding"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <fragment
-            android:id="@+id/crypto_consumers_list_fragment"
-            android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/menu/api_account_settings.xml b/OpenKeychain/src/main/res/menu/api_account_settings.xml
index d08fc7f42..713345ffc 100644
--- a/OpenKeychain/src/main/res/menu/api_account_settings.xml
+++ b/OpenKeychain/src/main/res/menu/api_account_settings.xml
@@ -6,9 +6,5 @@
         android:id="@+id/menu_account_settings_delete"
         android:title="@string/api_settings_delete_account"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/menu_account_settings_cancel"
-        android:title="@string/api_settings_cancel"
-        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file