Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs

1 files changed, 0 insertions, 197 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
deleted file mode 100644
index 88caebc32..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
+++ /dev/null
@@ -1,197 +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.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.helper.ContactHelper;
-import org.sufficientlysecure.keychain.helper.Preferences;
-import org.sufficientlysecure.keychain.util.Log;
-
-import java.util.List;
-
-public class ImportKeysServerFragment extends Fragment {
-    public static final String ARG_QUERY = "query";
-    public static final String ARG_KEYSERVER = "keyserver";
-    public static final String ARG_DISABLE_QUERY_EDIT = "disable_query_edit";
-
-    private ImportKeysActivity mImportActivity;
-
-    private View mSearchButton;
-    private AutoCompleteTextView mQueryEditText;
-    private View mConfigButton;
-    private View mConfigLayout;
-    private Spinner mServerSpinner;
-    private ArrayAdapter<String> mServerAdapter;
-
-    /**
-     * Creates new instance of this fragment
-     */
-    public static ImportKeysServerFragment newInstance(String query, String keyserver) {
-        ImportKeysServerFragment frag = new ImportKeysServerFragment();
-
-        Bundle args = new Bundle();
-        args.putString(ARG_QUERY, query);
-        args.putString(ARG_KEYSERVER, keyserver);
-
-        frag.setArguments(args);
-
-        return frag;
-    }
-
-    /**
-     * Inflate the layout for this fragment
-     */
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.import_keys_server_fragment, container, false);
-
-        mSearchButton = view.findViewById(R.id.import_server_search);
-        mQueryEditText = (AutoCompleteTextView) view.findViewById(R.id.import_server_query);
-        mConfigButton = view.findViewById(R.id.import_server_config_button);
-        mConfigLayout = view.findViewById(R.id.import_server_config);
-        mServerSpinner = (Spinner) view.findViewById(R.id.import_server_spinner);
-
-        // add keyservers to spinner
-        mServerAdapter = new ArrayAdapter<String>(getActivity(),
-                android.R.layout.simple_spinner_item, Preferences.getPreferences(getActivity())
-                .getKeyServers()
-        );
-        mServerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mServerSpinner.setAdapter(mServerAdapter);
-        if (mServerAdapter.getCount() > 0) {
-            mServerSpinner.setSelection(0);
-        } else {
-            mSearchButton.setEnabled(false);
-        }
-
-        List<String> namesAndEmails = ContactHelper.getContactNames(getActivity());
-        namesAndEmails.addAll(ContactHelper.getContactMails(getActivity()));
-        mQueryEditText.setThreshold(3);
-        mQueryEditText.setAdapter(
-                new ArrayAdapter<String>
-                        (getActivity(), android.R.layout.simple_spinner_dropdown_item,
-                                namesAndEmails
-                        )
-        );
-
-        mSearchButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                String query = mQueryEditText.getText().toString();
-                String keyServer = (String) mServerSpinner.getSelectedItem();
-                search(query, keyServer);
-
-                // close keyboard after pressing search
-                InputMethodManager imm =
-                        (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(mQueryEditText.getWindowToken(), 0);
-            }
-        });
-
-        mQueryEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-                    String query = mQueryEditText.getText().toString();
-                    String keyServer = (String) mServerSpinner.getSelectedItem();
-                    search(query, keyServer);
-
-                    // Don't return true to let the keyboard close itself after pressing search
-                    return false;
-                }
-                return false;
-            }
-        });
-
-        mConfigButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mImportActivity.getViewPagerHeight() > ImportKeysActivity.VIEW_PAGER_HEIGHT) {
-                    mImportActivity.resizeViewPager(ImportKeysActivity.VIEW_PAGER_HEIGHT);
-                } else {
-                    mImportActivity.resizeViewPager(ImportKeysActivity.VIEW_PAGER_HEIGHT + 41);
-                }
-            }
-        });
-
-        return view;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        // set displayed values
-        if (getArguments() != null) {
-            if (getArguments().containsKey(ARG_QUERY)) {
-                String query = getArguments().getString(ARG_QUERY);
-                mQueryEditText.setText(query, TextView.BufferType.EDITABLE);
-
-                Log.d(Constants.TAG, "query: " + query);
-            }
-
-            if (getArguments().containsKey(ARG_KEYSERVER)) {
-                String keyserver = getArguments().getString(ARG_KEYSERVER);
-                int keyserverPos = mServerAdapter.getPosition(keyserver);
-                mServerSpinner.setSelection(keyserverPos);
-
-                Log.d(Constants.TAG, "keyserver: " + keyserver);
-            }
-
-            if (getArguments().getBoolean(ARG_DISABLE_QUERY_EDIT, false)) {
-                mQueryEditText.setEnabled(false);
-            }
-        }
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-
-        mImportActivity = (ImportKeysActivity) activity;
-    }
-
-    private void search(String query, String keyserver) {
-        mImportActivity.loadCallback(new ImportKeysListFragment.KeyserverLoaderState(query, keyserver));
-    }
-
-    public void setQueryAndKeyserver(String query, String keyserver) {
-        mQueryEditText.setText(query, TextView.BufferType.EDITABLE);
-        int keyServerPos = mServerAdapter.getPosition(keyserver);
-        mServerSpinner.setSelection(keyServerPos);
-    }
-
-}