ImportKeys: Cleanup

- Move loader package inside keyimport package
- Change name of variables
- Remove unused images

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/AsyncTaskResultWrapper.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.ui.loader;
+package org.sufficientlysecure.keychain.keyimport.loader;
 
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/BytesLoaderState.java

@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.ui.loader;
+package org.sufficientlysecure.keychain.keyimport.loader;
 
 import android.net.Uri;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/CloudLoaderState.java

@@ -1,4 +1,4 @@
-package org.sufficientlysecure.keychain.ui.loader;
+package org.sufficientlysecure.keychain.keyimport.loader;
 
 import org.sufficientlysecure.keychain.util.Preferences;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListCloudLoader.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.ui.loader;
+package org.sufficientlysecure.keychain.keyimport.loader;
 
 import android.content.Context;
 import android.support.annotation.Nullable;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListLoader.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.sufficientlysecure.keychain.ui.loader;
+package org.sufficientlysecure.keychain.keyimport.loader;
 
 
 import java.io.BufferedInputStream;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/LoaderState.java

@@ -0,0 +1,4 @@
+package org.sufficientlysecure.keychain.keyimport.loader;
+
+public interface LoaderState {
+}

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java

@@ -44,7 +44,7 @@ import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.SecurityTokenListenerFragment;
 import org.sufficientlysecure.keychain.ui.base.QueueingCryptoOperationFragment;
-import org.sufficientlysecure.keychain.ui.loader.CloudLoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.CloudLoaderState;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.Preferences;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java

@@ -24,8 +24,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -39,9 +37,9 @@ import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
 import org.sufficientlysecure.keychain.ui.base.BaseActivity;
 import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
-import org.sufficientlysecure.keychain.ui.loader.BytesLoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.BytesLoaderState;
-import org.sufficientlysecure.keychain.ui.loader.CloudLoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.CloudLoaderState;
-import org.sufficientlysecure.keychain.ui.loader.LoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.LoaderState;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.util.Log;
@@ -349,7 +347,7 @@ public class ImportKeysActivity extends BaseActivity
             Log.d(Constants.TAG, "importKeys started");
 
             // get DATA from selected key entries
-            IteratorWithSize<ParcelableKeyRing> selectedEntries = keyListFragment.getSelectedData();
+            IteratorWithSize<ParcelableKeyRing> entries = keyListFragment.getData();
 
             // instead of giving the entries by Intent extra, cache them into a
             // file to prevent Java Binder problems on heavy imports
@@ -359,17 +357,16 @@ public class ImportKeysActivity extends BaseActivity
                 // display here, we should be able to import.
                 ParcelableFileCache<ParcelableKeyRing> cache =
                         new ParcelableFileCache<>(this, "key_import.pcl");
-                cache.writeCache(selectedEntries);
+                cache.writeCache(entries);
-
-                mKeyList = null;
-                mKeyserver = null;
-                mOperationHelper.cryptoOperation();
-
             } catch (IOException e) {
                 Log.e(Constants.TAG, "Problem writing cache file", e);
                 Notify.create(this, "Problem writing cache file!", Notify.Style.ERROR)
                         .show((ViewGroup) findViewById(R.id.import_snackbar));
+                return;
             }
+
+            mKeyList = null;
+            mKeyserver = null;
         } else if (ls instanceof CloudLoaderState) {
             CloudLoaderState sls = (CloudLoaderState) ls;
 
@@ -386,9 +383,9 @@ public class ImportKeysActivity extends BaseActivity
 
             mKeyList = keys;
             mKeyserver = sls.mCloudPrefs.keyserver;
-            mOperationHelper.cryptoOperation();
-
         }
+
+        mOperationHelper.cryptoOperation();
     }
 
     @Override

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java

@@ -39,7 +39,7 @@ import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.ui.loader.CloudLoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.CloudLoaderState;
 import org.sufficientlysecure.keychain.util.ContactHelper;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Preferences;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java

@@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.compatibility.ClipboardReflection;
 import org.sufficientlysecure.keychain.pgp.PgpHelper;
-import org.sufficientlysecure.keychain.ui.loader.BytesLoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.BytesLoaderState;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.util.FileHelper;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java

@@ -49,12 +49,12 @@ import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 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.loader.AsyncTaskResultWrapper;
+import org.sufficientlysecure.keychain.keyimport.loader.AsyncTaskResultWrapper;
-import org.sufficientlysecure.keychain.ui.loader.BytesLoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.BytesLoaderState;
-import org.sufficientlysecure.keychain.ui.loader.CloudLoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.CloudLoaderState;
-import org.sufficientlysecure.keychain.ui.loader.ImportKeysListCloudLoader;
+import org.sufficientlysecure.keychain.keyimport.loader.ImportKeysListCloudLoader;
-import org.sufficientlysecure.keychain.ui.loader.ImportKeysListLoader;
+import org.sufficientlysecure.keychain.keyimport.loader.ImportKeysListLoader;
-import org.sufficientlysecure.keychain.ui.loader.LoaderState;
+import org.sufficientlysecure.keychain.keyimport.loader.LoaderState;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ParcelableFileCache.IteratorWithSize;
 import org.sufficientlysecure.keychain.util.ParcelableProxy;
@@ -108,7 +108,7 @@ public class ImportKeysListFragment extends Fragment implements
      * ArrayList would have been, but we save some memory by just returning
      * relevant elements on demand.
      */
-    public IteratorWithSize<ParcelableKeyRing> getSelectedData() {
+    public IteratorWithSize<ParcelableKeyRing> getData() {
         final List<ImportKeysListEntry> entries = getEntries();
         final Iterator<ImportKeysListEntry> it = entries.iterator();
         return new IteratorWithSize<ParcelableKeyRing>() {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/LoaderState.java

@@ -1,4 +0,0 @@
-package org.sufficientlysecure.keychain.ui.loader;
-
-public interface LoaderState {
-}

OpenKeychain/src/main/res/values/colors.xml

@@ -2,7 +2,6 @@
 <resources>
 
     <color name="primary">#7bad45</color>
-    <color name="primaryLight">#e5f0da</color>
 
     <color name="icons">#ffffff</color>
     <color name="transparent">#00ffffff</color>