Merge branch 'development' into detached-sigs-api

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

6 files changed, 254 insertions, 227 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index 478013f55..f2af43b6f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -85,9 +85,9 @@ public class OpenPgpService extends RemoteService {
         boolean missingUserIdsCheck = false;
         boolean duplicateUserIdsCheck = false;
 
-        ArrayList<Long> keyIds = new ArrayList<Long>();
-        ArrayList<String> missingUserIds = new ArrayList<String>();
-        ArrayList<String> duplicateUserIds = new ArrayList<String>();
+        ArrayList<Long> keyIds = new ArrayList<>();
+        ArrayList<String> missingUserIds = new ArrayList<>();
+        ArrayList<String> duplicateUserIds = new ArrayList<>();
         if (!noUserIdsCheck) {
             for (String email : encryptionUserIds) {
                 // try to find the key for this specific email
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
index e71b52ccd..672f59285 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java
@@ -27,7 +27,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.Signature;
 import android.net.Uri;
 import android.os.Binder;
-import android.text.TextUtils;
 
 import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.util.OpenPgpApi;
@@ -216,9 +215,7 @@ public abstract class RemoteService extends Service {
         String[] callingPackages = getPackageManager().getPackagesForUid(uid);
 
         // is calling package allowed to use this service?
-        for (int i = 0; i < callingPackages.length; i++) {
-            String currentPkg = callingPackages[i];
-
+        for (String currentPkg : callingPackages) {
             if (isPackageAllowed(currentPkg)) {
                 return true;
             }
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 0e9678980..e5edd6a0f 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
@@ -20,14 +20,13 @@ package org.sufficientlysecure.keychain.remote.ui;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.ui.util.ActionBarHelper;
+import org.sufficientlysecure.keychain.ui.BaseActivity;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.remote.AccountSettings;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
@@ -35,7 +34,7 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult.LogTyp
 import org.sufficientlysecure.keychain.operations.results.SingletonResult;
 import org.sufficientlysecure.keychain.util.Log;
 
-public class AccountSettingsActivity extends ActionBarActivity {
+public class AccountSettingsActivity extends BaseActivity {
     private Uri mAccountUri;
 
     private AccountSettingsFragment mAccountSettingsFragment;
@@ -45,17 +44,20 @@ public class AccountSettingsActivity extends ActionBarActivity {
         super.onCreate(savedInstanceState);
 
         // Inflate a "Done" custom action bar
-        ActionBarHelper.setOneButtonView(getSupportActionBar(),
-                R.string.api_settings_save, R.drawable.ic_action_done,
+        setFullScreenDialogDoneClose(R.string.api_settings_save,
                 new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        // "Done"
                         save();
                     }
+                },
+                new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        finish();
+                    }
                 });
 
-        setContentView(R.layout.api_account_settings_activity);
 
         mAccountSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById(
                 R.id.api_account_settings_fragment);
@@ -73,6 +75,11 @@ public class AccountSettingsActivity extends ActionBarActivity {
     }
 
     @Override
+    protected void initLayout() {
+        setContentView(R.layout.api_account_settings_activity);
+    }
+
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         getMenuInflater().inflate(R.menu.api_account_settings, menu);
@@ -125,9 +132,4 @@ public class AccountSettingsActivity extends ActionBarActivity {
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        save();
-        super.onBackPressed();
-    }
 }
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 56e3b22e2..e91482e28 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
@@ -22,8 +22,6 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -33,9 +31,10 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.remote.AppSettings;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
+import org.sufficientlysecure.keychain.ui.BaseActivity;
 import org.sufficientlysecure.keychain.util.Log;
 
-public class AppSettingsActivity extends ActionBarActivity {
+public class AppSettingsActivity extends BaseActivity {
     private Uri mAppUri;
 
     private AppSettingsFragment mSettingsFragment;
@@ -49,12 +48,11 @@ public class AppSettingsActivity extends ActionBarActivity {
         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);
+//        ActionBar actionBar = getSupportActionBar();
+//        actionBar.setDisplayHomeAsUpEnabled(true);
+//        actionBar.setIcon(android.R.color.transparent);
+//        actionBar.setHomeButtonEnabled(true);
 
-        setContentView(R.layout.api_app_settings_activity);
 
         mSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
                 R.id.api_app_settings_fragment);
@@ -72,6 +70,11 @@ public class AppSettingsActivity extends ActionBarActivity {
     }
 
     @Override
+    protected void initLayout() {
+        setContentView(R.layout.api_app_settings_activity);
+    }
+
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         getMenuInflater().inflate(R.menu.api_app_settings, menu);
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
index 11b0deb33..3b4cc654e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java
@@ -21,16 +21,27 @@ 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 DrawerActivity {
+public class AppsListActivity extends NavDrawerActivity {
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+//    @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);
-
-        activateDrawerNavigation(savedInstanceState);
     }
 
+
+//    @Override
+//    protected void initLayout() {
+//        setContentView(R.layout.api_apps_list_activity);
+//    }
+
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
index d7b723eb0..cbc593b0a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
@@ -22,7 +22,6 @@ import android.graphics.Color;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -39,14 +38,14 @@ import org.sufficientlysecure.keychain.provider.KeychainContract;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.remote.AccountSettings;
 import org.sufficientlysecure.keychain.remote.AppSettings;
+import org.sufficientlysecure.keychain.ui.BaseActivity;
 import org.sufficientlysecure.keychain.ui.SelectPublicKeyFragment;
-import org.sufficientlysecure.keychain.ui.util.ActionBarHelper;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.util.ArrayList;
 
-public class RemoteServiceActivity extends ActionBarActivity {
+public class RemoteServiceActivity extends BaseActivity {
 
     public static final String ACTION_REGISTER = Constants.INTENT_PREFIX + "API_ACTIVITY_REGISTER";
     public static final String ACTION_CREATE_ACCOUNT = Constants.INTENT_PREFIX
@@ -96,235 +95,250 @@ public class RemoteServiceActivity extends ActionBarActivity {
         handleActions(getIntent(), savedInstanceState);
     }
 
+    @Override
+    protected void initLayout() {
+        // done in handleActions()
+    }
+
     protected void handleActions(Intent intent, Bundle savedInstanceState) {
 
         String action = intent.getAction();
         final Bundle extras = intent.getExtras();
 
 
-        if (ACTION_REGISTER.equals(action)) {
-            final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
-            final byte[] packageSignature = extras.getByteArray(EXTRA_PACKAGE_SIGNATURE);
-            Log.d(Constants.TAG, "ACTION_REGISTER packageName: " + packageName);
+        switch (action) {
+            case ACTION_REGISTER: {
+                final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
+                final byte[] packageSignature = extras.getByteArray(EXTRA_PACKAGE_SIGNATURE);
+                Log.d(Constants.TAG, "ACTION_REGISTER packageName: " + packageName);
 
-            setContentView(R.layout.api_remote_register_app);
+                setContentView(R.layout.api_remote_register_app);
+                initToolbar();
 
-            mAppSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
-                    R.id.api_app_settings_fragment);
+                mAppSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
+                        R.id.api_app_settings_fragment);
 
-            AppSettings settings = new AppSettings(packageName, packageSignature);
-            mAppSettingsFragment.setAppSettings(settings);
+                AppSettings settings = new AppSettings(packageName, packageSignature);
+                mAppSettingsFragment.setAppSettings(settings);
 
-            // Inflate a "Done"/"Cancel" custom action bar view
-            ActionBarHelper.setTwoButtonView(getSupportActionBar(),
-                    R.string.api_register_allow, R.drawable.ic_action_done,
-                    new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            // Allow
+                // Inflate a "Done"/"Cancel" custom action bar view
+                setFullScreenDialogTwoButtons(
+                        R.string.api_register_allow, R.drawable.ic_check_white_24dp,
+                        new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                // Allow
 
-                            mProviderHelper.insertApiApp(mAppSettingsFragment.getAppSettings());
+                                mProviderHelper.insertApiApp(mAppSettingsFragment.getAppSettings());
 
-                            // give data through for new service call
-                            Intent resultData = extras.getParcelable(EXTRA_DATA);
-                            RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
-                            RemoteServiceActivity.this.finish();
-                        }
-                    }, R.string.api_register_disallow, R.drawable.ic_action_cancel,
-                    new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            // Disallow
-                            RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                            RemoteServiceActivity.this.finish();
+                                // give data through for new service call
+                                Intent resultData = extras.getParcelable(EXTRA_DATA);
+                                RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
+                                RemoteServiceActivity.this.finish();
+                            }
+                        }, R.string.api_register_disallow, R.drawable.ic_close_white_24dp,
+                        new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                // Disallow
+                                RemoteServiceActivity.this.setResult(RESULT_CANCELED);
+                                RemoteServiceActivity.this.finish();
+                            }
                         }
-                    }
-            );
-        } else if (ACTION_CREATE_ACCOUNT.equals(action)) {
-            final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
-            final String accName = extras.getString(EXTRA_ACC_NAME);
+                );
+                break;
+            }
+            case ACTION_CREATE_ACCOUNT: {
+                final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
+                final String accName = extras.getString(EXTRA_ACC_NAME);
 
-            setContentView(R.layout.api_remote_create_account);
+                setContentView(R.layout.api_remote_create_account);
+                initToolbar();
 
-            mAccSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById(
-                    R.id.api_account_settings_fragment);
+                mAccSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById(
+                        R.id.api_account_settings_fragment);
 
-            TextView text = (TextView) findViewById(R.id.api_remote_create_account_text);
+                TextView text = (TextView) findViewById(R.id.api_remote_create_account_text);
 
-            // update existing?
-            Uri uri = KeychainContract.ApiAccounts.buildByPackageAndAccountUri(packageName, accName);
-            AccountSettings settings = mProviderHelper.getApiAccountSettings(uri);
-            if (settings == null) {
-                // create new account
-                settings = new AccountSettings(accName);
-                mUpdateExistingAccount = false;
+                // update existing?
+                Uri uri = KeychainContract.ApiAccounts.buildByPackageAndAccountUri(packageName, accName);
+                AccountSettings settings = mProviderHelper.getApiAccountSettings(uri);
+                if (settings == null) {
+                    // create new account
+                    settings = new AccountSettings(accName);
+                    mUpdateExistingAccount = false;
 
-                text.setText(R.string.api_create_account_text);
-            } else {
-                // update existing account
-                mUpdateExistingAccount = true;
+                    text.setText(R.string.api_create_account_text);
+                } else {
+                    // update existing account
+                    mUpdateExistingAccount = true;
 
-                text.setText(R.string.api_update_account_text);
-            }
-            mAccSettingsFragment.setAccSettings(settings);
-
-            // Inflate a "Done"/"Cancel" custom action bar view
-            ActionBarHelper.setTwoButtonView(getSupportActionBar(),
-                    R.string.api_settings_save, R.drawable.ic_action_done,
-                    new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            // Save
-
-                            // user needs to select a key if it has explicitly requested (None is only allowed for new accounts)
-                            if (mUpdateExistingAccount && mAccSettingsFragment.getAccSettings().getKeyId() == Constants.key.none) {
-                                Notify.showNotify(RemoteServiceActivity.this, getString(R.string.api_register_error_select_key), Notify.Style.ERROR);
-                            } else {
-                                if (mUpdateExistingAccount) {
-                                    Uri baseUri = KeychainContract.ApiAccounts.buildBaseUri(packageName);
-                                    Uri accountUri = baseUri.buildUpon().appendEncodedPath(accName).build();
-                                    mProviderHelper.updateApiAccount(
-                                            accountUri,
-                                            mAccSettingsFragment.getAccSettings());
+                    text.setText(R.string.api_update_account_text);
+                }
+                mAccSettingsFragment.setAccSettings(settings);
+
+                // Inflate a "Done"/"Cancel" custom action bar view
+                setFullScreenDialogDoneClose(R.string.api_settings_save,
+                        new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                // Save
+
+                                // user needs to select a key if it has explicitly requested (None is only allowed for new accounts)
+                                if (mUpdateExistingAccount && mAccSettingsFragment.getAccSettings().getKeyId() == Constants.key.none) {
+                                    Notify.showNotify(RemoteServiceActivity.this, getString(R.string.api_register_error_select_key), Notify.Style.ERROR);
                                 } else {
-                                    mProviderHelper.insertApiAccount(
-                                            KeychainContract.ApiAccounts.buildBaseUri(packageName),
-                                            mAccSettingsFragment.getAccSettings());
+                                    if (mUpdateExistingAccount) {
+                                        Uri baseUri = KeychainContract.ApiAccounts.buildBaseUri(packageName);
+                                        Uri accountUri = baseUri.buildUpon().appendEncodedPath(accName).build();
+                                        mProviderHelper.updateApiAccount(
+                                                accountUri,
+                                                mAccSettingsFragment.getAccSettings());
+                                    } else {
+                                        mProviderHelper.insertApiAccount(
+                                                KeychainContract.ApiAccounts.buildBaseUri(packageName),
+                                                mAccSettingsFragment.getAccSettings());
+                                    }
+
+                                    // give data through for new service call
+                                    Intent resultData = extras.getParcelable(EXTRA_DATA);
+                                    RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
+                                    RemoteServiceActivity.this.finish();
                                 }
-
-                                // give data through for new service call
-                                Intent resultData = extras.getParcelable(EXTRA_DATA);
-                                RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
+                            }
+                        },
+                        new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                // Cancel
+                                RemoteServiceActivity.this.setResult(RESULT_CANCELED);
                                 RemoteServiceActivity.this.finish();
                             }
-                        }
-                    }, R.string.api_settings_cancel, R.drawable.ic_action_cancel,
-                    new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            // Cancel
-                            RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                            RemoteServiceActivity.this.finish();
-                        }
+                        });
+
+                break;
+            }
+            case ACTION_SELECT_PUB_KEYS: {
+                long[] selectedMasterKeyIds = intent.getLongArrayExtra(EXTRA_SELECTED_MASTER_KEY_IDS);
+                boolean noUserIdsCheck = intent.getBooleanExtra(EXTRA_NO_USER_IDS_CHECK, true);
+                ArrayList<String> missingUserIds = intent
+                        .getStringArrayListExtra(EXTRA_MISSING_USER_IDS);
+                ArrayList<String> dublicateUserIds = intent
+                        .getStringArrayListExtra(EXTRA_DUPLICATE_USER_IDS);
+
+                SpannableStringBuilder ssb = new SpannableStringBuilder();
+                final SpannableString textIntro = new SpannableString(
+                        noUserIdsCheck ? getString(R.string.api_select_pub_keys_text_no_user_ids)
+                                : getString(R.string.api_select_pub_keys_text)
+                );
+                textIntro.setSpan(new StyleSpan(Typeface.BOLD), 0, textIntro.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                ssb.append(textIntro);
+
+                if (missingUserIds != null && missingUserIds.size() > 0) {
+                    ssb.append("\n\n");
+                    ssb.append(getString(R.string.api_select_pub_keys_missing_text));
+                    ssb.append("\n");
+                    for (String userId : missingUserIds) {
+                        SpannableString ss = new SpannableString(userId + "\n");
+                        ss.setSpan(new BulletSpan(15, Color.BLACK), 0, ss.length(),
+                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        ssb.append(ss);
                     }
-            );
-
-        } else if (ACTION_SELECT_PUB_KEYS.equals(action)) {
-            long[] selectedMasterKeyIds = intent.getLongArrayExtra(EXTRA_SELECTED_MASTER_KEY_IDS);
-            boolean noUserIdsCheck = intent.getBooleanExtra(EXTRA_NO_USER_IDS_CHECK, true);
-            ArrayList<String> missingUserIds = intent
-                    .getStringArrayListExtra(EXTRA_MISSING_USER_IDS);
-            ArrayList<String> dublicateUserIds = intent
-                    .getStringArrayListExtra(EXTRA_DUPLICATE_USER_IDS);
-
-            SpannableStringBuilder ssb = new SpannableStringBuilder();
-            final SpannableString textIntro = new SpannableString(
-                    noUserIdsCheck ? getString(R.string.api_select_pub_keys_text_no_user_ids)
-                            : getString(R.string.api_select_pub_keys_text)
-            );
-            textIntro.setSpan(new StyleSpan(Typeface.BOLD), 0, textIntro.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-            ssb.append(textIntro);
-
-            if (missingUserIds != null && missingUserIds.size() > 0) {
-                ssb.append("\n\n");
-                ssb.append(getString(R.string.api_select_pub_keys_missing_text));
-                ssb.append("\n");
-                for (String userId : missingUserIds) {
-                    SpannableString ss = new SpannableString(userId + "\n");
-                    ss.setSpan(new BulletSpan(15, Color.BLACK), 0, ss.length(),
-                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    ssb.append(ss);
                 }
-            }
-            if (dublicateUserIds != null && dublicateUserIds.size() > 0) {
-                ssb.append("\n\n");
-                ssb.append(getString(R.string.api_select_pub_keys_dublicates_text));
-                ssb.append("\n");
-                for (String userId : dublicateUserIds) {
-                    SpannableString ss = new SpannableString(userId + "\n");
-                    ss.setSpan(new BulletSpan(15, Color.BLACK), 0, ss.length(),
-                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    ssb.append(ss);
+                if (dublicateUserIds != null && dublicateUserIds.size() > 0) {
+                    ssb.append("\n\n");
+                    ssb.append(getString(R.string.api_select_pub_keys_dublicates_text));
+                    ssb.append("\n");
+                    for (String userId : dublicateUserIds) {
+                        SpannableString ss = new SpannableString(userId + "\n");
+                        ss.setSpan(new BulletSpan(15, Color.BLACK), 0, ss.length(),
+                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        ssb.append(ss);
+                    }
                 }
-            }
 
-            // Inflate a "Done"/"Cancel" custom action bar view
-            ActionBarHelper.setTwoButtonView(getSupportActionBar(),
-                    R.string.btn_okay, R.drawable.ic_action_done,
-                    new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            // add key ids to params Bundle for new request
-                            Intent resultData = extras.getParcelable(EXTRA_DATA);
-                            resultData.putExtra(OpenPgpApi.EXTRA_KEY_IDS,
-                                    mSelectFragment.getSelectedMasterKeyIds());
-
-                            RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
-                            RemoteServiceActivity.this.finish();
-                        }
-                    }, R.string.btn_do_not_save, R.drawable.ic_action_cancel, new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            // cancel
-                            RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                            RemoteServiceActivity.this.finish();
-                        }
-                    }
-            );
+                setContentView(R.layout.api_remote_select_pub_keys);
+                initToolbar();
 
-            setContentView(R.layout.api_remote_select_pub_keys);
+                // Inflate a "Done"/"Cancel" custom action bar view
+                setFullScreenDialogDoneClose(R.string.btn_okay,
+                        new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                // add key ids to params Bundle for new request
+                                Intent resultData = extras.getParcelable(EXTRA_DATA);
+                                resultData.putExtra(OpenPgpApi.EXTRA_KEY_IDS,
+                                        mSelectFragment.getSelectedMasterKeyIds());
 
-            // set text on view
-            TextView textView = (TextView) findViewById(R.id.api_select_pub_keys_text);
-            textView.setText(ssb, TextView.BufferType.SPANNABLE);
+                                RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
+                                RemoteServiceActivity.this.finish();
+                            }
+                        },
+                        new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                // cancel
+                                RemoteServiceActivity.this.setResult(RESULT_CANCELED);
+                                RemoteServiceActivity.this.finish();
+                            }
+                        });
+
+                // set text on view
+                TextView textView = (TextView) findViewById(R.id.api_select_pub_keys_text);
+                textView.setText(ssb, TextView.BufferType.SPANNABLE);
+
+                /* Load select pub keys fragment */
+                // Check that the activity is using the layout version with
+                // the fragment_container FrameLayout
+                if (findViewById(R.id.api_select_pub_keys_fragment_container) != null) {
+
+                    // However, if we're being restored from a previous state,
+                    // then we don't need to do anything and should return or else
+                    // we could end up with overlapping fragments.
+                    if (savedInstanceState != null) {
+                        return;
+                    }
 
-            /* Load select pub keys fragment */
-            // Check that the activity is using the layout version with
-            // the fragment_container FrameLayout
-            if (findViewById(R.id.api_select_pub_keys_fragment_container) != null) {
+                    // Create an instance of the fragment
+                    mSelectFragment = SelectPublicKeyFragment.newInstance(selectedMasterKeyIds);
 
-                // However, if we're being restored from a previous state,
-                // then we don't need to do anything and should return or else
-                // we could end up with overlapping fragments.
-                if (savedInstanceState != null) {
-                    return;
+                    // Add the fragment to the 'fragment_container' FrameLayout
+                    getSupportFragmentManager().beginTransaction()
+                            .add(R.id.api_select_pub_keys_fragment_container, mSelectFragment).commit();
                 }
-
-                // Create an instance of the fragment
-                mSelectFragment = SelectPublicKeyFragment.newInstance(selectedMasterKeyIds);
-
-                // Add the fragment to the 'fragment_container' FrameLayout
-                getSupportFragmentManager().beginTransaction()
-                        .add(R.id.api_select_pub_keys_fragment_container, mSelectFragment).commit();
+                break;
             }
-        } else if (ACTION_ERROR_MESSAGE.equals(action)) {
-            String errorMessage = intent.getStringExtra(EXTRA_ERROR_MESSAGE);
+            case ACTION_ERROR_MESSAGE: {
+                String errorMessage = intent.getStringExtra(EXTRA_ERROR_MESSAGE);
 
-            Spannable redErrorMessage = new SpannableString(errorMessage);
-            redErrorMessage.setSpan(new ForegroundColorSpan(Color.RED), 0, errorMessage.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                Spannable redErrorMessage = new SpannableString(errorMessage);
+                redErrorMessage.setSpan(new ForegroundColorSpan(Color.RED), 0, errorMessage.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 
-            // Inflate a "Done" custom action bar view
-            ActionBarHelper.setOneButtonView(getSupportActionBar(),
-                    R.string.btn_okay, R.drawable.ic_action_done,
-                    new View.OnClickListener() {
+                setContentView(R.layout.api_remote_error_message);
+                initToolbar();
 
-                        @Override
-                        public void onClick(View v) {
-                            RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                            RemoteServiceActivity.this.finish();
-                        }
-                    }
-            );
+                // Inflate a "Done" custom action bar view
+                setFullScreenDialogClose(
+                        new View.OnClickListener() {
 
-            setContentView(R.layout.api_remote_error_message);
+                            @Override
+                            public void onClick(View v) {
+                                RemoteServiceActivity.this.setResult(RESULT_CANCELED);
+                                RemoteServiceActivity.this.finish();
+                            }
+                        }
+                );
 
-            // set text on view
-            TextView textView = (TextView) findViewById(R.id.api_app_error_message_text);
-            textView.setText(redErrorMessage);
-        } else {
-            Log.e(Constants.TAG, "Action does not exist!");
-            setResult(RESULT_CANCELED);
-            finish();
+                // set text on view
+                TextView textView = (TextView) findViewById(R.id.api_app_error_message_text);
+                textView.setText(redErrorMessage);
+                break;
+            }
+            default:
+                Log.e(Constants.TAG, "Action does not exist!");
+                setResult(RESULT_CANCELED);
+                finish();
+                break;
         }
     }
 }