From 9f7320b857cad530f92f9012f103a105ba4a0a9d Mon Sep 17 00:00:00 2001 From: Andrea Torlaschi Date: Fri, 17 Jun 2016 22:41:00 +0200 Subject: [PATCH] ImportKeys: Cleanup - Move loader package inside keyimport package - Change name of variables - Remove unused images --- .../loader/AsyncTaskResultWrapper.java | 2 +- .../loader/BytesLoaderState.java | 2 +- .../loader/CloudLoaderState.java | 2 +- .../loader/ImportKeysListCloudLoader.java | 2 +- .../loader/ImportKeysListLoader.java | 2 +- .../keyimport/loader/LoaderState.java | 4 +++ ...reateSecurityTokenImportResetFragment.java | 2 +- .../keychain/ui/ImportKeysActivity.java | 25 ++++++++---------- .../keychain/ui/ImportKeysCloudFragment.java | 2 +- .../keychain/ui/ImportKeysFileFragment.java | 2 +- .../keychain/ui/ImportKeysListFragment.java | 14 +++++----- .../keychain/ui/loader/LoaderState.java | 4 --- .../ic_file_download_white_24dp.png | Bin 163 -> 0 bytes .../ic_file_download_white_24dp.png | Bin 116 -> 0 bytes .../ic_file_download_white_24dp.png | Bin 157 -> 0 bytes .../ic_file_download_white_24dp.png | Bin 197 -> 0 bytes .../ic_file_download_white_24dp.png | Bin 233 -> 0 bytes OpenKeychain/src/main/res/values/colors.xml | 1 - 18 files changed, 30 insertions(+), 34 deletions(-) rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/{ui => keyimport}/loader/AsyncTaskResultWrapper.java (96%) rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/{ui => keyimport}/loader/BytesLoaderState.java (81%) rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/{ui => keyimport}/loader/CloudLoaderState.java (86%) rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/{ui => keyimport}/loader/ImportKeysListCloudLoader.java (99%) rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/{ui => keyimport}/loader/ImportKeysListLoader.java (99%) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/LoaderState.java delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/LoaderState.java delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/AsyncTaskResultWrapper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/AsyncTaskResultWrapper.java similarity index 96% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/AsyncTaskResultWrapper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/AsyncTaskResultWrapper.java index 65108b1d3..5adf8b686 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/AsyncTaskResultWrapper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/AsyncTaskResultWrapper.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package org.sufficientlysecure.keychain.ui.loader; +package org.sufficientlysecure.keychain.keyimport.loader; import org.sufficientlysecure.keychain.operations.results.OperationResult; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/BytesLoaderState.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/BytesLoaderState.java similarity index 81% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/BytesLoaderState.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/BytesLoaderState.java index 759848e64..909aec917 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/BytesLoaderState.java +++ b/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; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/CloudLoaderState.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/CloudLoaderState.java similarity index 86% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/CloudLoaderState.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/CloudLoaderState.java index 4014562d0..11b42eb61 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/CloudLoaderState.java +++ b/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; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListCloudLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListCloudLoader.java similarity index 99% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListCloudLoader.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListCloudLoader.java index 991ce56a0..06db131ac 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListCloudLoader.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListCloudLoader.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package org.sufficientlysecure.keychain.ui.loader; +package org.sufficientlysecure.keychain.keyimport.loader; import android.content.Context; import android.support.annotation.Nullable; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListLoader.java similarity index 99% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListLoader.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListLoader.java index 0d7c76bcb..eb7946af1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListLoader.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListLoader.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package org.sufficientlysecure.keychain.ui.loader; +package org.sufficientlysecure.keychain.keyimport.loader; import java.io.BufferedInputStream; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/LoaderState.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/LoaderState.java new file mode 100644 index 000000000..9e5c6bdfc --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/LoaderState.java @@ -0,0 +1,4 @@ +package org.sufficientlysecure.keychain.keyimport.loader; + +public interface LoaderState { +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java index 682f63e9c..4e0a8c6bd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java +++ b/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; 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 fd5ecf587..906f7240d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/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.ui.loader.CloudLoaderState; -import org.sufficientlysecure.keychain.ui.loader.LoaderState; +import org.sufficientlysecure.keychain.keyimport.loader.BytesLoaderState; +import org.sufficientlysecure.keychain.keyimport.loader.CloudLoaderState; +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 selectedEntries = keyListFragment.getSelectedData(); + IteratorWithSize 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 cache = new ParcelableFileCache<>(this, "key_import.pcl"); - cache.writeCache(selectedEntries); - - mKeyList = null; - mKeyserver = null; - mOperationHelper.cryptoOperation(); - + cache.writeCache(entries); } 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 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java index c2e97c214..51215c946 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java +++ b/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; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java index 1552225b4..46c4d37e6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java +++ b/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; 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 797bed681..69337df4e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/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.ui.loader.BytesLoaderState; -import org.sufficientlysecure.keychain.ui.loader.CloudLoaderState; -import org.sufficientlysecure.keychain.ui.loader.ImportKeysListCloudLoader; -import org.sufficientlysecure.keychain.ui.loader.ImportKeysListLoader; -import org.sufficientlysecure.keychain.ui.loader.LoaderState; +import org.sufficientlysecure.keychain.keyimport.loader.AsyncTaskResultWrapper; +import org.sufficientlysecure.keychain.keyimport.loader.BytesLoaderState; +import org.sufficientlysecure.keychain.keyimport.loader.CloudLoaderState; +import org.sufficientlysecure.keychain.keyimport.loader.ImportKeysListCloudLoader; +import org.sufficientlysecure.keychain.keyimport.loader.ImportKeysListLoader; +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 getSelectedData() { + public IteratorWithSize getData() { final List entries = getEntries(); final Iterator it = entries.iterator(); return new IteratorWithSize() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/LoaderState.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/LoaderState.java deleted file mode 100644 index d4f669790..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/LoaderState.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.sufficientlysecure.keychain.ui.loader; - -public interface LoaderState { -} diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png deleted file mode 100644 index c8a2039c583803eab552eb2ad15248ad4f306b14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8mZytjh{y4_Q*ZMgP~c#YJsK$U z)~(q1m-m)lF^^vy&zFBx;@>#sNTW$[{bH;=%sZG7QZ>uQBcw?@Ce|ClF7G156^ z#Rt_}Q9HRs{l8sYa>)1&$3+cMLFMTJXY2PZ*sH$V@BeR?lj;@>g(qYZ*L3k@0BvRP MboFyt=akR{0D4_J0ssI2 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png deleted file mode 100644 index d400472fd64b0a90998ce6c5eab813b7c8eeec12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@+fn?1dz*HZ0um z&|dF?!>nm+mvS-{o;0&fnzA@EQ^BmzWWo}eRZ9~msAiWq$nrXiF)+AFy^vQr>(2u; OhQZU-&t;ucLK6V({vp)> diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png deleted file mode 100644 index f53cc0c62c228828d73c90f681eda0835179b0b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D6i*k&kch)?FYe|&V8Fv1*n95m zR5e$DAHp{l&A!8XfIV8!#r>2YP$7e#!c^^(-Y0%@RoZ*qi`F<)`EKq{{v+@Hw5*sR zFA(}!c2Utj$B^^;IgbBnE;xI?rFh=CsojiM7+vgNGclA;TJ|n(&Igb&p00i_>zopr E0CTxJ1ONa4 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png deleted file mode 100644 index 78aa591668242095017c9d5e96f7a9873fe1fbc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawdOTemLo)8Yz3#}@pdi5FIM2@h zcsF};z`+CWBzDIKG_pEry11Auz9p#O(7?dR#KIx4z`kMCt2a+vCtcS%nf>^QsrM(T z{K~l&Yj@SA9If=c^vXIaY>wlkMR7)vg;t&u=kNuYJa3$GaHnEwp`ORgIc%D@VZ8#xa<@HhnOS1viNAnEC})a|0sJS72xJ-2)f?&QaR z?3aFfZT$|bN3Ya!ZWwgOIdJDMXyKo5=w(d|$6F^2ai?7ZNyM@uS}y1~X^1JRa37T8 i%D!pbm~%M(0r%^vOJ5j@by@-4#Ng@b=d#Wzp$Pz$!&MXj diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index f0b40ca37..d9075b587 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -2,7 +2,6 @@ #7bad45 - #e5f0da #ffffff #00ffffff