Work on Qr code import

5 files changed, 70 insertions, 43 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 8f3851e84..6d3b7c340 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -28,6 +28,7 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.Parcelable;
+import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBarActivity;
 import android.view.MotionEvent;
@@ -43,6 +44,7 @@ import com.github.johnpersano.supertoasts.util.Style;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.helper.Preferences;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
@@ -94,12 +96,12 @@ public class ImportKeysActivity extends ActionBarActivity {
 
     public static final int VIEW_PAGER_HEIGHT = 64; // dp
 
-    private static final int NAV_SERVER = 0;
-    private static final int NAV_QR_CODE = 1;
-    private static final int NAV_FILE = 2;
-    private static final int NAV_KEYBASE = 3;
+    private static final int TAB_KEYSERVER = 0;
+    private static final int TAB_QR_CODE = 1;
+    private static final int TAB_FILE = 2;
+    private static final int TAB_KEYBASE = 3;
 
-    private int mSwitchToTab = NAV_SERVER;
+    private int mSwitchToTab = TAB_KEYSERVER;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -118,10 +120,6 @@ public class ImportKeysActivity extends ActionBarActivity {
             }
         });
 
-        // TODO: add actionbar button for this action?
-//        if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN.equals(getIntent().getAction())) {
-//        }
-
         handleActions(savedInstanceState, getIntent());
     }
 
@@ -150,7 +148,7 @@ public class ImportKeysActivity extends ActionBarActivity {
             /* Keychain's own Actions */
 
             // display file fragment
-            mViewPager.setCurrentItem(NAV_FILE);
+            mViewPager.setCurrentItem(TAB_FILE);
 
             if (dataUri != null) {
                 // action: directly load data
@@ -185,7 +183,7 @@ public class ImportKeysActivity extends ActionBarActivity {
                     // display keyserver fragment with query
                     serverBundle = new Bundle();
                     serverBundle.putString(ImportKeysServerFragment.ARG_QUERY, query);
-                    mSwitchToTab = NAV_SERVER;
+                    mSwitchToTab = TAB_KEYSERVER;
 
                     // action: search immediately
                     startListFragment(savedInstanceState, null, null, query);
@@ -209,7 +207,7 @@ public class ImportKeysActivity extends ActionBarActivity {
                     serverBundle.putBoolean(ImportKeysServerFragment.ARG_DISABLE_QUERY_EDIT, true);
                     // display server tab only
                     serverOnly = true;
-                    mSwitchToTab = NAV_SERVER;
+                    mSwitchToTab = TAB_KEYSERVER;
 
                     // action: search immediately
                     startListFragment(savedInstanceState, null, null, query);
@@ -223,7 +221,7 @@ public class ImportKeysActivity extends ActionBarActivity {
             }
         } else if (ACTION_IMPORT_KEY_FROM_FILE.equals(action)) {
             // NOTE: this only displays the appropriate fragment, no actions are taken
-            mSwitchToTab = NAV_FILE;
+            mSwitchToTab = TAB_FILE;
 
             // no immediate actions!
             startListFragment(savedInstanceState, null, null, null);
@@ -231,20 +229,20 @@ public class ImportKeysActivity extends ActionBarActivity {
             // also exposed in AndroidManifest
 
             // NOTE: this only displays the appropriate fragment, no actions are taken
-            mSwitchToTab = NAV_QR_CODE;
+            mSwitchToTab = TAB_QR_CODE;
 
             // no immediate actions!
             startListFragment(savedInstanceState, null, null, null);
         } else if (ACTION_IMPORT_KEY_FROM_NFC.equals(action)) {
 
             // NOTE: this only displays the appropriate fragment, no actions are taken
-            mSwitchToTab = NAV_QR_CODE;
+            mSwitchToTab = TAB_QR_CODE;
 
             // no immediate actions!
             startListFragment(savedInstanceState, null, null, null);
         } else if (ACTION_IMPORT_KEY_FROM_KEYBASE.equals(action)) {
             // NOTE: this only displays the appropriate fragment, no actions are taken
-            mSwitchToTab = NAV_KEYBASE;
+            mSwitchToTab = TAB_KEYBASE;
 
             // no immediate actions!
             startListFragment(savedInstanceState, null, null, null);
@@ -269,6 +267,8 @@ public class ImportKeysActivity extends ActionBarActivity {
 
             @Override
             public void onPageSelected(int position) {
+                // cancel loader and clear list
+                mListFragment.destroyLoader();
             }
 
             @Override
@@ -330,18 +330,32 @@ public class ImportKeysActivity extends ActionBarActivity {
 
         Log.d(Constants.TAG, "fingerprint: " + fingerprint);
 
-        // TODO: reload fragment when coming from qr code!
-//        loadFromFingerprint(savedInstanceState, fingerprint);
+        final String query = "0x" + fingerprint;
+
+        mViewPager.setCurrentItem(TAB_KEYSERVER);
+
+        // update layout after operations
+        mSlidingTabLayout.setViewPager(mViewPager);
+
+        ImportKeysServerFragment f = (ImportKeysServerFragment)
+                getActiveFragment(mViewPager, TAB_KEYSERVER);
+
+        // TODO: Currently it simply uses keyserver nr 0
+        String keyserver = Preferences.getPreferences(ImportKeysActivity.this)
+                .getKeyServers()[0];
 
+        f.searchCallback(query, keyserver);
+    }
+
+    // http://stackoverflow.com/a/9293207
+    public Fragment getActiveFragment(ViewPager container, int position) {
+        String name = makeFragmentName(container.getId(), position);
+        return getSupportFragmentManager().findFragmentByTag(name);
+    }
 
-//        String query = "0x" + fingerprint;
-//
-//        // display keyserver fragment with query
-//        Bundle serverBundle = new Bundle();
-//        serverBundle.putString(ImportKeysServerFragment.ARG_QUERY, query);
-//        serverBundle.putBoolean(ImportKeysServerFragment.ARG_DISABLE_QUERY_EDIT, true);
-//
-//        return serverBundle;
+    // http://stackoverflow.com/a/9293207
+    private static String makeFragmentName(int viewId, int index) {
+        return "android:switcher:" + viewId + ":" + index;
     }
 
     private boolean isFingerprintValid(String fingerprint) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 45c44803c..e7bb38514 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -156,7 +156,7 @@ public class ImportKeysListFragment extends ListFragment implements
         if (dataUri != null || bytes != null) {
             mLoaderState = new BytesLoaderState(bytes, dataUri);
         } else if (query != null) {
-            // TODO: this is used when scanning QR Code or updating a key.
+            // TODO: this is used when updating a key.
             // Currently it simply uses keyserver nr 0
             String keyserver = Preferences.getPreferences(getActivity())
                     .getKeyServers()[0];
@@ -185,27 +185,34 @@ public class ImportKeysListFragment extends ListFragment implements
         restartLoaders();
     }
 
+    public void destroyLoader() {
+        if (getLoaderManager().getLoader(LOADER_ID_BYTES) != null) {
+            getLoaderManager().destroyLoader(LOADER_ID_BYTES);
+        }
+        if (getLoaderManager().getLoader(LOADER_ID_SERVER_QUERY) != null) {
+            getLoaderManager().destroyLoader(LOADER_ID_SERVER_QUERY);
+        }
+        if (getLoaderManager().getLoader(LOADER_ID_KEYBASE) != null) {
+            getLoaderManager().destroyLoader(LOADER_ID_KEYBASE);
+        }
+        setListShown(true);
+    }
+
     private void restartLoaders() {
         if (mLoaderState instanceof BytesLoaderState) {
             // Start out with a progress indicator.
             setListShown(false);
 
             getLoaderManager().restartLoader(LOADER_ID_BYTES, null, this);
-            getLoaderManager().destroyLoader(LOADER_ID_SERVER_QUERY);
-            getLoaderManager().destroyLoader(LOADER_ID_KEYBASE);
         } else if (mLoaderState instanceof KeyserverLoaderState) {
             // Start out with a progress indicator.
             setListShown(false);
 
-            getLoaderManager().destroyLoader(LOADER_ID_BYTES);
             getLoaderManager().restartLoader(LOADER_ID_SERVER_QUERY, null, this);
-            getLoaderManager().destroyLoader(LOADER_ID_KEYBASE);
         } else if (mLoaderState instanceof KeybaseLoaderState) {
             // Start out with a progress indicator.
             setListShown(false);
 
-            getLoaderManager().destroyLoader(LOADER_ID_BYTES);
-            getLoaderManager().destroyLoader(LOADER_ID_SERVER_QUERY);
             getLoaderManager().restartLoader(LOADER_ID_KEYBASE, null, this);
         }
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
index c7467d789..ff694cb4f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java
@@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.util.Log;
 
 public class ImportKeysServerFragment extends Fragment {
     public static final String ARG_QUERY = "query";
-    public static final String ARG_KEY_SERVER = "key_server";
+    public static final String ARG_KEYSERVER = "keyserver";
     public static final String ARG_DISABLE_QUERY_EDIT = "disable_query_edit";
 
     private ImportKeysActivity mImportActivity;
@@ -55,12 +55,12 @@ public class ImportKeysServerFragment extends Fragment {
     /**
      * Creates new instance of this fragment
      */
-    public static ImportKeysServerFragment newInstance(String query, String keyServer) {
+    public static ImportKeysServerFragment newInstance(String query, String keyserver) {
         ImportKeysServerFragment frag = new ImportKeysServerFragment();
 
         Bundle args = new Bundle();
         args.putString(ARG_QUERY, query);
-        args.putString(ARG_KEY_SERVER, keyServer);
+        args.putString(ARG_KEYSERVER, keyserver);
 
         frag.setArguments(args);
 
@@ -149,12 +149,12 @@ public class ImportKeysServerFragment extends Fragment {
                 Log.d(Constants.TAG, "query: " + query);
             }
 
-            if (getArguments().containsKey(ARG_KEY_SERVER)) {
-                String keyServer = getArguments().getString(ARG_KEY_SERVER);
-                int keyServerPos = mServerAdapter.getPosition(keyServer);
-                mServerSpinner.setSelection(keyServerPos);
+            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);
+                Log.d(Constants.TAG, "keyserver: " + keyserver);
             }
 
             if (getArguments().getBoolean(ARG_DISABLE_QUERY_EDIT, false)) {
@@ -174,4 +174,11 @@ public class ImportKeysServerFragment extends Fragment {
         mImportActivity.loadCallback(new ImportKeysListFragment.KeyserverLoaderState(query, keyserver));
     }
 
+    public void searchCallback(String query, String keyserver) {
+        mQueryEditText.setText(query, TextView.BufferType.EDITABLE);
+        int keyServerPos = mServerAdapter.getPosition(keyserver);
+        mServerSpinner.setSelection(keyServerPos);
+        search(query, keyserver);
+    }
+
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 233b1fca8..a44d32e5b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -170,7 +170,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
         } else {
             holder.userIdsList.setVisibility(View.VISIBLE);
 
-            // clear view from holder
+            // destroyLoader view from holder
             holder.userIdsList.removeAllViews();
 
             Iterator<String> it = entry.getUserIds().iterator();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index 4eb6f158b..d62c2db43 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
@@ -47,7 +47,6 @@ public class ImportKeysListServerLoader
 
     @Override
     public AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> loadInBackground() {
-
         mEntryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(mEntryList, null);
 
         if (mServerQuery == null) {