Rename folder structure from OpenPGP Keychain to OpenKeychain

1 files changed, 0 insertions, 303 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
deleted file mode 100644
index ab95f2691..000000000
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java
+++ /dev/null
@@ -1,303 +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.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v7.app.ActionBarActivity;
-import android.view.View;
-
-import org.openintents.openpgp.util.OpenPgpApi;
-import org.sufficientlysecure.htmltextview.HtmlTextView;
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.Id;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.helper.ActionBarHelper;
-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.SelectPublicKeyFragment;
-import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
-import org.sufficientlysecure.keychain.util.Log;
-
-import java.util.ArrayList;
-
-public class RemoteServiceActivity extends ActionBarActivity {
-
-    public static final String ACTION_REGISTER = Constants.INTENT_PREFIX + "API_ACTIVITY_REGISTER";
-    public static final String ACTION_CREATE_ACCOUNT = Constants.INTENT_PREFIX
-            + "API_ACTIVITY_CREATE_ACCOUNT";
-    public static final String ACTION_CACHE_PASSPHRASE = Constants.INTENT_PREFIX
-            + "API_ACTIVITY_CACHE_PASSPHRASE";
-    public static final String ACTION_SELECT_PUB_KEYS = Constants.INTENT_PREFIX
-            + "API_ACTIVITY_SELECT_PUB_KEYS";
-    public static final String ACTION_ERROR_MESSAGE = Constants.INTENT_PREFIX
-            + "API_ACTIVITY_ERROR_MESSAGE";
-
-    public static final String EXTRA_MESSENGER = "messenger";
-
-    public static final String EXTRA_DATA = "data";
-
-    // passphrase action
-    public static final String EXTRA_SECRET_KEY_ID = "secret_key_id";
-    // register action
-    public static final String EXTRA_PACKAGE_NAME = "package_name";
-    public static final String EXTRA_PACKAGE_SIGNATURE = "package_signature";
-    // create acc action
-    public static final String EXTRA_ACC_NAME = "acc_name";
-    // select pub keys action
-    public static final String EXTRA_SELECTED_MASTER_KEY_IDS = "master_key_ids";
-    public static final String EXTRA_MISSING_USER_IDS = "missing_user_ids";
-    public static final String EXTRA_DUBLICATE_USER_IDS = "dublicate_user_ids";
-    // error message
-    public static final String EXTRA_ERROR_MESSAGE = "error_message";
-
-    // register view
-    private AppSettingsFragment mAppSettingsFragment;
-    // create acc view
-    private AccountSettingsFragment mAccSettingsFragment;
-    // select pub keys view
-    private SelectPublicKeyFragment mSelectFragment;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        handleActions(getIntent(), savedInstanceState);
-    }
-
-    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);
-
-            // 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
-
-                            ProviderHelper.insertApiApp(RemoteServiceActivity.this,
-                                    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();
-                        }
-                    }
-            );
-
-            setContentView(R.layout.api_remote_register_app);
-
-            mAppSettingsFragment = (AppSettingsFragment) getSupportFragmentManager().findFragmentById(
-                    R.id.api_app_settings_fragment);
-
-            AppSettings settings = new AppSettings(packageName, packageSignature);
-            mAppSettingsFragment.setAppSettings(settings);
-        } else if (ACTION_CREATE_ACCOUNT.equals(action)) {
-            final String packageName = extras.getString(EXTRA_PACKAGE_NAME);
-            final String accName = extras.getString(EXTRA_ACC_NAME);
-
-            // 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 (mAccSettingsFragment.getAccSettings().getKeyId() == Id.key.none) {
-                                mAccSettingsFragment.setErrorOnSelectKeyFragment(
-                                        getString(R.string.api_register_error_select_key));
-                            } else {
-                                ProviderHelper.insertApiAccount(RemoteServiceActivity.this,
-                                        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();
-                            }
-                        }
-                    }, 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();
-                        }
-                    }
-            );
-
-            setContentView(R.layout.api_remote_create_account);
-
-            mAccSettingsFragment = (AccountSettingsFragment) getSupportFragmentManager().findFragmentById(
-                    R.id.api_account_settings_fragment);
-
-            AccountSettings settings = new AccountSettings(accName);
-            mAccSettingsFragment.setAccSettings(settings);
-        } else if (ACTION_CACHE_PASSPHRASE.equals(action)) {
-            long secretKeyId = extras.getLong(EXTRA_SECRET_KEY_ID);
-            final Intent resultData = extras.getParcelable(EXTRA_DATA);
-
-            PassphraseDialogFragment.show(this, secretKeyId,
-                new Handler() {
-                    @Override
-                    public void handleMessage(Message message) {
-                        if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
-                            // return given params again, for calling the service method again
-                            RemoteServiceActivity.this.setResult(RESULT_OK, resultData);
-                        } else {
-                            RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                        }
-
-                        RemoteServiceActivity.this.finish();
-                    }
-                });
-
-        } else if (ACTION_SELECT_PUB_KEYS.equals(action)) {
-            long[] selectedMasterKeyIds = intent.getLongArrayExtra(EXTRA_SELECTED_MASTER_KEY_IDS);
-            ArrayList<String> missingUserIds = intent
-                    .getStringArrayListExtra(EXTRA_MISSING_USER_IDS);
-            ArrayList<String> dublicateUserIds = intent
-                    .getStringArrayListExtra(EXTRA_DUBLICATE_USER_IDS);
-
-            // TODO: do this with spannable instead of HTML to prevent parsing failures with weird user ids
-            String text = "<b>" + getString(R.string.api_select_pub_keys_text) + "</b>";
-            text += "<br/><br/>";
-            if (missingUserIds != null && missingUserIds.size() > 0) {
-                text += getString(R.string.api_select_pub_keys_missing_text);
-                text += "<br/>";
-                text += "<ul>";
-                for (String userId : missingUserIds) {
-                    text += "<li>" + userId + "</li>";
-                }
-                text += "</ul>";
-                text += "<br/>";
-            }
-            if (dublicateUserIds != null && dublicateUserIds.size() > 0) {
-                text += getString(R.string.api_select_pub_keys_dublicates_text);
-                text += "<br/>";
-                text += "<ul>";
-                for (String userId : dublicateUserIds) {
-                    text += "<li>" + userId + "</li>";
-                }
-                text += "</ul>";
-            }
-
-            // 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);
-
-            // set text on view
-            HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_select_pub_keys_text);
-            textView.setHtmlFromString(text);
-
-            /* 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;
-                }
-
-                // 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();
-            }
-        } else if (ACTION_ERROR_MESSAGE.equals(action)) {
-            String errorMessage = intent.getStringExtra(EXTRA_ERROR_MESSAGE);
-
-            String text = "<font color=\"red\">" + errorMessage + "</font>";
-
-            // Inflate a "Done" custom action bar view
-            ActionBarHelper.setOneButtonView(getSupportActionBar(),
-                    R.string.btn_okay, R.drawable.ic_action_done,
-                    new View.OnClickListener() {
-
-                        @Override
-                        public void onClick(View v) {
-                            RemoteServiceActivity.this.setResult(RESULT_CANCELED);
-                            RemoteServiceActivity.this.finish();
-                        }
-                    });
-
-            setContentView(R.layout.api_remote_error_message);
-
-            // set text on view
-            HtmlTextView textView = (HtmlTextView) findViewById(R.id.api_app_error_message_text);
-            textView.setHtmlFromString(text);
-        } else {
-            Log.e(Constants.TAG, "Action does not exist!");
-            setResult(RESULT_CANCELED);
-            finish();
-        }
-    }
-}