preferences and help into menu not drawer according to guidelines and google apps

OpenPGP-Keychain/res/layout/encrypt.xml

@@ -119,7 +119,7 @@
                             android:layout_gravity="center_vertical"
                             android:layout_margin="4dp"
                             android:text="@string/btn_select_encrypt_keys"
-                            bootstrapbutton:bb_icon_left="fa-users"
+                            bootstrapbutton:bb_icon_left="fa-user"
                             bootstrapbutton:bb_size="default"
                             bootstrapbutton:bb_type="default" />
                     </LinearLayout>

OpenPGP-Keychain/res/values/strings.xml

@@ -81,6 +81,7 @@
 
     <!-- menu -->
     <string name="menu_preferences">Settings</string>
+    <string name="menu_help">Help</string>
     <string name="menu_api_app_settings">Registered Apps</string>
     <string name="menu_import_from_file">Import from file</string>
     <string name="menu_import_from_qr_code">Import from QR Code</string>
@@ -375,9 +376,7 @@
     <string name="nav_decrypt">Decrypt</string>
     <string name="nav_import">Import Keys</string>
     <string name="nav_secret_keys">My Keys</string>
-    <string name="nav_settings">Settings</string>
     <string name="nav_apps">Registered Apps</string>
-    <string name="nav_help">Help</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
 

OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/ExportHelper.java

@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.sufficientlysecure.keychain.helper;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
+import org.sufficientlysecure.keychain.util.Log;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.Messenger;
+import android.widget.Toast;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+public class ExportHelper {
+    protected FileDialogFragment mFileDialog;
+    protected String mExportFilename;
+
+    SherlockFragmentActivity activity;
+
+    public ExportHelper(SherlockFragmentActivity activity) {
+        super();
+        this.activity = activity;
+    }
+
+    public void deleteKey(Uri dataUri, final int keyType, Handler deleteHandler) {
+        long keyRingRowId = Long.valueOf(dataUri.getLastPathSegment());
+
+        // Create a new Messenger for the communication back
+        Messenger messenger = new Messenger(deleteHandler);
+
+        DeleteKeyDialogFragment deleteKeyDialog = DeleteKeyDialogFragment.newInstance(messenger,
+                new long[] { keyRingRowId }, keyType);
+
+        deleteKeyDialog.show(activity.getSupportFragmentManager(), "deleteKeyDialog");
+    }
+
+    /**
+     * Show dialog where to export keys
+     * 
+     * @param keyRingMasterKeyId
+     *            if -1 export all keys
+     */
+    public void showExportKeysDialog(final Uri dataUri, final int keyType,
+            final String exportFilename) {
+        mExportFilename = exportFilename;
+
+        // Message is received after file is selected
+        Handler returnHandler = new Handler() {
+            @Override
+            public void handleMessage(Message message) {
+                if (message.what == FileDialogFragment.MESSAGE_OKAY) {
+                    Bundle data = message.getData();
+                    mExportFilename = data.getString(FileDialogFragment.MESSAGE_DATA_FILENAME);
+
+                    long keyRingRowId = Long.valueOf(dataUri.getLastPathSegment());
+
+                    // TODO?
+                    long keyRingMasterKeyId = ProviderHelper.getSecretMasterKeyId(activity,
+                            keyRingRowId);
+
+                    exportKeys(keyRingMasterKeyId, keyType);
+                }
+            }
+        };
+
+        // Create a new Messenger for the communication back
+        final Messenger messenger = new Messenger(returnHandler);
+
+        DialogFragmentWorkaround.INTERFACE.runnableRunDelayed(new Runnable() {
+            public void run() {
+                String title = null;
+                if (dataUri != null) {
+                    // single key export
+                    title = activity.getString(R.string.title_export_key);
+                } else {
+                    title = activity.getString(R.string.title_export_keys);
+                }
+
+                String message = null;
+                if (keyType == Id.type.public_key) {
+                    message = activity.getString(R.string.specify_file_to_export_to);
+                } else {
+                    message = activity.getString(R.string.specify_file_to_export_secret_keys_to);
+                }
+
+                mFileDialog = FileDialogFragment.newInstance(messenger, title, message,
+                        exportFilename, null, Id.request.filename);
+
+                mFileDialog.show(activity.getSupportFragmentManager(), "fileDialog");
+            }
+        });
+    }
+
+    /**
+     * Export keys
+     * 
+     * @param keyRingMasterKeyId
+     *            if -1 export all keys
+     */
+    public void exportKeys(long keyRingMasterKeyId, int keyType) {
+        Log.d(Constants.TAG, "exportKeys started");
+
+        // Send all information needed to service to export key in other thread
+        Intent intent = new Intent(activity, KeychainIntentService.class);
+
+        intent.setAction(KeychainIntentService.ACTION_EXPORT_KEYRING);
+
+        // fill values for this action
+        Bundle data = new Bundle();
+
+        data.putString(KeychainIntentService.EXPORT_FILENAME, mExportFilename);
+        data.putInt(KeychainIntentService.EXPORT_KEY_TYPE, keyType);
+
+        if (keyRingMasterKeyId == -1) {
+            data.putBoolean(KeychainIntentService.EXPORT_ALL, true);
+        } else {
+            data.putLong(KeychainIntentService.EXPORT_KEY_RING_MASTER_KEY_ID, keyRingMasterKeyId);
+        }
+
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
+
+        // Message is received after exporting is done in ApgService
+        KeychainIntentServiceHandler exportHandler = new KeychainIntentServiceHandler(activity,
+                R.string.progress_exporting, ProgressDialog.STYLE_HORIZONTAL) {
+            public void handleMessage(Message message) {
+                // handle messages by standard ApgHandler first
+                super.handleMessage(message);
+
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
+                    // get returned data bundle
+                    Bundle returnData = message.getData();
+
+                    int exported = returnData.getInt(KeychainIntentService.RESULT_EXPORT);
+                    String toastMessage;
+                    if (exported == 1) {
+                        toastMessage = activity.getString(R.string.key_exported);
+                    } else if (exported > 0) {
+                        toastMessage = activity.getString(R.string.keys_exported, exported);
+                    } else {
+                        toastMessage = activity.getString(R.string.no_keys_exported);
+                    }
+                    Toast.makeText(activity, toastMessage, Toast.LENGTH_SHORT).show();
+
+                }
+            };
+        };
+
+        // Create a new Messenger for the communication back
+        Messenger messenger = new Messenger(exportHandler);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
+
+        // show progress dialog
+        exportHandler.showProgressDialog(activity);
+
+        // start service with intent
+        activity.startService(intent);
+    }
+
+    public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == Id.request.filename) {
+            if (resultCode == Activity.RESULT_OK && data != null) {
+                try {
+                    String path = data.getData().getPath();
+                    Log.d(Constants.TAG, "path=" + path);
+
+                    // set filename used in export/import dialogs
+                    mFileDialog.setFilename(path);
+                } catch (NullPointerException e) {
+                    Log.e(Constants.TAG, "Nullpointer while retrieving path!", e);
+                }
+            }
+            return true;
+        }
+
+        return false;
+    }
+}

OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DrawerActivity.java

@@ -60,8 +60,10 @@ public class DrawerActivity extends SherlockFragmentActivity {
 
     private static Class[] mItemsClass = new Class[] { KeyListPublicActivity.class,
             EncryptActivity.class, DecryptActivity.class, ImportKeysActivity.class,
-            KeyListSecretActivity.class, PreferencesActivity.class,
+            KeyListSecretActivity.class, RegisteredAppsListActivity.class };
-            RegisteredAppsListActivity.class, HelpActivity.class };
+
+    private static final int MENU_ID_PREFERENCE = 222;
+    private static final int MENU_ID_HELP = 223;
 
     protected void setupDrawerNavigation(Bundle savedInstanceState) {
         mDrawerTitle = getString(R.string.app_name);
@@ -78,9 +80,7 @@ public class DrawerActivity extends SherlockFragmentActivity {
                 new NavItem("fa-unlock", getString(R.string.nav_decrypt)),
                 new NavItem("fa-download", getString(R.string.nav_import)),
                 new NavItem("fa-key", getString(R.string.nav_secret_keys)),
-                new NavItem("fa-wrench", getString(R.string.nav_settings)),
+                new NavItem("fa-android", getString(R.string.nav_apps)) };
-                new NavItem("fa-android", getString(R.string.nav_apps)),
-                new NavItem("fa-question", getString(R.string.nav_help)), };
 
         mDrawerList.setAdapter(new NavigationDrawerAdapter(this, R.layout.drawer_list_item,
                 mItemIconTexts));
@@ -119,6 +119,14 @@ public class DrawerActivity extends SherlockFragmentActivity {
         // }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        menu.add(42, MENU_ID_PREFERENCE, 100, R.string.menu_preferences);
+        menu.add(42, MENU_ID_HELP, 101, R.string.menu_help);
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
     /* Called whenever we call invalidateOptionsMenu() */
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
@@ -137,7 +145,20 @@ public class DrawerActivity extends SherlockFragmentActivity {
             return true;
         }
 
+        switch (item.getItemId()) {
+        case MENU_ID_PREFERENCE: {
+            Intent intent = new Intent(this, PreferencesActivity.class);
+            startActivity(intent);
+            return true;
+        }
+        case MENU_ID_HELP: {
+            Intent intent = new Intent(this, HelpActivity.class);
+            startActivity(intent);
+            return true;
+        }
+        default:
             return super.onOptionsItemSelected(item);
+        }
 
         // Handle action buttons
         // switch (item.getItemId()) {
@@ -365,7 +386,7 @@ public class DrawerActivity extends SherlockFragmentActivity {
         };
     }
 
-    /* The click listner for ListView in the navigation drawer */
+    /* The click listener for ListView in the navigation drawer */
     private class DrawerItemClickListener implements ListView.OnItemClickListener {
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpActivity.java

@@ -34,7 +34,7 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.Tab;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
-public class HelpActivity extends DrawerActivity {
+public class HelpActivity extends SherlockFragmentActivity {
     public static final String EXTRA_SELECTED_TAB = "selectedTab";
 
     ViewPager mViewPager;
@@ -50,10 +50,11 @@ public class HelpActivity extends DrawerActivity {
 
         mViewPager = (ViewPager) findViewById(R.id.pager);
 
-        setupDrawerNavigation(savedInstanceState);
+        final ActionBar actionBar = getSupportActionBar();
-
+        actionBar.setDisplayShowTitleEnabled(true);
-        ActionBar bar = getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(false);
-        bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        actionBar.setHomeButtonEnabled(false);
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 
         mTabsAdapter = new TabsAdapter(this, mViewPager);
 
@@ -65,20 +66,20 @@ public class HelpActivity extends DrawerActivity {
 
         Bundle startBundle = new Bundle();
         startBundle.putInt(HelpFragmentHtml.ARG_HTML_FILE, R.raw.help_start);
-        mTabsAdapter.addTab(bar.newTab().setText(getString(R.string.help_tab_start)),
+        mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_start)),
                 HelpFragmentHtml.class, startBundle, (selectedTab == 0 ? true : false));
 
         Bundle nfcBundle = new Bundle();
         nfcBundle.putInt(HelpFragmentHtml.ARG_HTML_FILE, R.raw.help_nfc_beam);
-        mTabsAdapter.addTab(bar.newTab().setText(getString(R.string.help_tab_nfc_beam)),
+        mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_nfc_beam)),
                 HelpFragmentHtml.class, nfcBundle, (selectedTab == 1 ? true : false));
 
         Bundle changelogBundle = new Bundle();
         changelogBundle.putInt(HelpFragmentHtml.ARG_HTML_FILE, R.raw.help_changelog);
-        mTabsAdapter.addTab(bar.newTab().setText(getString(R.string.help_tab_changelog)),
+        mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_changelog)),
                 HelpFragmentHtml.class, changelogBundle, (selectedTab == 2 ? true : false));
 
-        mTabsAdapter.addTab(bar.newTab().setText(getString(R.string.help_tab_about)),
+        mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.help_tab_about)),
                 HelpFragmentAbout.class, null, (selectedTab == 3 ? true : false));
     }
 

OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java

@@ -51,8 +51,8 @@ public class PreferencesActivity extends SherlockPreferenceActivity {
 
         final ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayShowTitleEnabled(true);
-        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayHomeAsUpEnabled(false);
-        actionBar.setHomeButtonEnabled(true);
+        actionBar.setHomeButtonEnabled(false);
 
         addPreferencesFromResource(R.xml.preferences);
 
@@ -218,5 +218,4 @@ public class PreferencesActivity extends SherlockPreferenceActivity {
         }
         }
     }
-
 }