cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ImportKeys: Cleanup

Browse Source 
- Move loader package inside keyimport package
- Change name of variables
- Remove unused images
This commit is contained in:
Andrea Torlaschi
2016-06-17 22:41:00 +02:00
parent 155ebc4d69
commit 9f7320b857
18 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/AsyncTaskResultWrapper.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/AsyncTaskResultWrapper.java
View File

@@ -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;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/BytesLoaderState.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/BytesLoaderState.java
View File

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

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/CloudLoaderState.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/CloudLoaderState.java
View File

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

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListCloudLoader.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListCloudLoader.java
View File

@@ -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;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/loader/ImportKeysListLoader.java → OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/ImportKeysListLoader.java
View File

@@ -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;

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/loader/LoaderState.java Normal file
View File

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

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenImportResetFragment.java
View File

@@ -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;

25
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@@ -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<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);
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

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java
View File

@@ -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;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
View File

@@ -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;

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@@ -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<ParcelableKeyRing> getSelectedData() {
public IteratorWithSize<ParcelableKeyRing> getData() {
final List<ImportKeysListEntry> entries = getEntries();
final Iterator<ImportKeysListEntry> it = entries.iterator();
return new IteratorWithSize<ParcelableKeyRing>() {

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

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