ImportKeys: Refactoring

2016-08-21 17:19:42 +02:00
parent 4e661886b1
commit f5e5a70d21
7 changed files with 49 additions and 115 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -30,6 +30,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.intents.OpenKeychainIntents;
 import org.sufficientlysecure.keychain.keyimport.FacebookKeyserver;
+import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysListener;
 import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysOperationCallback;
@@ -46,6 +47,8 @@ import org.sufficientlysecure.keychain.util.ParcelableFileCache;
 import org.sufficientlysecure.keychain.util.Preferences;

 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;

 public class ImportKeysActivity extends BaseActivity implements ImportKeysListener {

@@ -317,11 +320,11 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
    }

    @Override
-    public void importKeys() {
-        FragmentManager fM = getSupportFragmentManager();
-        ImportKeysListFragment listFragment = (ImportKeysListFragment) fM.findFragmentByTag(TAG_FRAG_LIST);
-
-        Log.d(Constants.TAG, "importKeys started");
+    public void importKeys(List<ImportKeysListEntry> entries) {
+        List<ParcelableKeyRing> keyRings = new ArrayList<>();
+        for (ImportKeysListEntry e : entries) {
+            keyRings.add(e.getParcelableKeyRing());
+        }
        // instead of giving the entries by Intent extra, cache them into a
        // file to prevent Java Binder problems on heavy imports
        // read FileImportCache for more info.
@@ -330,7 +333,7 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
            // display here, we should be able to import.
            ParcelableFileCache<ParcelableKeyRing> cache =
                    new ParcelableFileCache<>(this, ImportOperation.CACHE_FILE_NAME);
-            cache.writeCache(listFragment.getData());
+            cache.writeCache(entries.size(), keyRings.iterator());
        } catch (IOException e) {
            Log.e(Constants.TAG, "Problem writing cache file", e);
            Notify.create(this, "Problem writing cache file!", Notify.Style.ERROR).show();
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -31,13 +31,13 @@ import android.support.v4.content.Loader;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;

 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.databinding.ImportKeysListFragmentBinding;
 import org.sufficientlysecure.keychain.databinding.ImportKeysListItemBasicBinding;
 import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry;
-import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.keyimport.processing.AsyncTaskResultWrapper;
 import org.sufficientlysecure.keychain.keyimport.processing.BytesLoaderState;
 import org.sufficientlysecure.keychain.keyimport.processing.CloudLoaderState;
@@ -49,15 +49,12 @@ import org.sufficientlysecure.keychain.operations.results.GetKeyResult;
 import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
 import org.sufficientlysecure.keychain.ui.adapter.ImportKeysAdapter;
 import org.sufficientlysecure.keychain.ui.util.PermissionsUtil;
-import org.sufficientlysecure.keychain.util.IteratorWithSize;
 import org.sufficientlysecure.keychain.util.ParcelableProxy;
 import org.sufficientlysecure.keychain.util.Preferences;
 import org.sufficientlysecure.keychain.util.Preferences.CloudSearchPrefs;
 import org.sufficientlysecure.keychain.util.orbot.OrbotHelper;

 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;

 public class ImportKeysListFragment extends Fragment implements
        LoaderManager.LoaderCallbacks<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> {
@@ -69,13 +66,12 @@ public class ImportKeysListFragment extends Fragment implements
    public static final String ARG_CLOUD_SEARCH_PREFS = "cloud_search_prefs";

    private FragmentActivity mActivity;
-    private ImportKeysListener mCallback;
+    private ImportKeysListener mListener;

    private ImportKeysListFragmentBinding mBinding;
    private ImportKeysListItemBasicBinding mBindingBasic;
    private ParcelableProxy mParcelableProxy;

-    private List<ParcelableKeyRing> mKeyData;
    private ImportKeysAdapter mAdapter;
    private LoaderState mLoaderState;

@@ -154,7 +150,7 @@ public class ImportKeysListFragment extends Fragment implements
        mBindingBasic.setNonInteractive(nonInteractive);

        // Create an empty adapter we will use to display the loaded data.
-        mAdapter = new ImportKeysAdapter(mActivity, mCallback, nonInteractive);
+        mAdapter = new ImportKeysAdapter(mActivity, mListener, nonInteractive);
        mBinding.recyclerView.setAdapter(mAdapter);
        mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));

@@ -173,13 +169,13 @@ public class ImportKeysListFragment extends Fragment implements
            restartLoaders();
        }

-        mBinding.basic.importKeys.setOnClickListener(new View.OnClickListener() {
+        mBinding.basic.importKeys.setOnClickListener(new OnClickListener() {
            @Override
            public void onClick(View view) {
-                mCallback.importKeys();
+                mListener.importKeys(mAdapter.getEntries());
            }
        });
-        mBinding.basic.listKeys.setOnClickListener(new View.OnClickListener() {
+        mBinding.basic.listKeys.setOnClickListener(new OnClickListener() {
            @Override
            public void onClick(View view) {
                mBinding.setAdvanced(true);
@@ -194,7 +190,7 @@ public class ImportKeysListFragment extends Fragment implements
        super.onAttach(activity);

        try {
-            mCallback = (ImportKeysListener) activity;
+            mListener = (ImportKeysListener) activity;
        } catch (ClassCastException e) {
            throw new ClassCastException(activity.toString()
                    + " must implement ImportKeysListener");
@@ -214,10 +210,6 @@ public class ImportKeysListFragment extends Fragment implements
        }
    }

-    public LoaderState getState() {
-        return mLoaderState;
-    }
-
    public void loadState(LoaderState loaderState) {
        mLoaderState = loaderState;

@@ -255,9 +247,8 @@ public class ImportKeysListFragment extends Fragment implements
                break;
            }
            case LOADER_ID_CLOUD: {
-                CloudLoaderState ls = (CloudLoaderState) mLoaderState;
-                loader = new ImportKeysListCloudLoader(mActivity, ls.mServerQuery,
-                        ls.mCloudPrefs, mParcelableProxy);
+                loader = new ImportKeysListCloudLoader(mActivity, (CloudLoaderState) mLoaderState,
+                        mParcelableProxy);
                break;
            }
        }
@@ -274,30 +265,22 @@ public class ImportKeysListFragment extends Fragment implements
            Loader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> loader,
            AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>> data
    ) {
-        ArrayList<ImportKeysListEntry> result = data.getResult();

-        mKeyData = null;
-        mAdapter.setData(result);
+        mAdapter.setData(data.getResult());
+        int size = mAdapter.getItemCount();

-        int size = result.size();
        mBindingBasic.setNumber(size);
        mBinding.setStatus(size > 0 ? STATUS_LOADED : STATUS_EMPTY);

        GetKeyResult getKeyResult = (GetKeyResult) data.getOperationResult();
        switch (loader.getId()) {
            case LOADER_ID_BYTES:
-                if (getKeyResult.success()) {
-                    // No error
-                    mKeyData = ((ImportKeysListLoader) loader).getParcelableRings();
-                } else {
+                if (!getKeyResult.success()) {
                    getKeyResult.createNotify(mActivity).show();
                }
                break;
-
            case LOADER_ID_CLOUD:
-                if (getKeyResult.success()) {
-                    // No error
-                } else if (getKeyResult.isPending()) {
+                if (getKeyResult.isPending()) {
                    if (getKeyResult.getRequiredInputParcel().mType ==
                            RequiredInputParcel.RequiredInputType.ENABLE_ORBOT) {
                        if (mShowingOrbotDialog) {
@@ -342,11 +325,10 @@ public class ImportKeysListFragment extends Fragment implements
                        new Handler().post(showOrbotDialog);
                        mShowingOrbotDialog = true;
                    }
-                } else {
+                } else if (!getKeyResult.success()) {
                    getKeyResult.createNotify(mActivity).show();
                }
                break;
-
            default:
                break;
        }
@@ -359,36 +341,4 @@ public class ImportKeysListFragment extends Fragment implements
        mAdapter.clearData();
    }

-    /**
-     * Returns an Iterator (with size) of the selected data items.
-     * This iterator is sort of a tradeoff, it's slightly more complex than an
-     * ArrayList would have been, but we save some memory by just returning
-     * relevant elements on demand.
-     */
-    public IteratorWithSize<ParcelableKeyRing> getData() {
-        final Iterator<ParcelableKeyRing> it = mKeyData.iterator();
-        return new IteratorWithSize<ParcelableKeyRing>() {
-
-            @Override
-            public int getSize() {
-                return mKeyData.size();
-            }
-
-            @Override
-            public boolean hasNext() {
-                return it.hasNext();
-            }
-
-            @Override
-            public ParcelableKeyRing next() {
-                return it.next();
-            }
-
-            @Override
-            public void remove() {
-                it.remove();
-            }
-        };
-    }
-
 }
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -117,7 +117,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
    }

    @Override
-    public void onBindViewHolder(final ViewHolder holder, final int position) {
+    public void onBindViewHolder(ViewHolder holder, final int position) {
        final ImportKeysListItemBinding b = holder.b;
        final ImportKeysListEntry entry = mData.get(position);
        b.setEntry(entry);