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

use autovalue for ImportKeyringParcel

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-22 12:28:59 +02:00
parent 0095df6d89
commit ef366173d0
13 changed files with 39 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,7 +271,7 @@ public class CreateSecurityTokenImportResetFragment
@Override
public ImportKeyringParcel createOperationInput() {
return new ImportKeyringParcel(mKeyList, mKeyserver);
return ImportKeyringParcel.createImportKeyringParcel(mKeyList, mKeyserver);
}
@Override

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

@@ -159,7 +159,7 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager.
@Override
public ImportKeyringParcel createOperationInput() {
return new ImportKeyringParcel(keyList, keyserver);
return ImportKeyringParcel.createImportKeyringParcel(keyList, keyserver);
}
@Override

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

@@ -779,7 +779,7 @@ public class DecryptListFragment
@Override
public ImportKeyringParcel createOperationInput() {
return new ImportKeyringParcel(keyList, keyserver);
return ImportKeyringParcel.createImportKeyringParcel(keyList, keyserver);
}
@Override

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

@@ -357,7 +357,7 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
return;
}
ImportKeyringParcel inputParcel = new ImportKeyringParcel(null, null);
ImportKeyringParcel inputParcel = ImportKeyringParcel.createImportKeyringParcel(null, null);
ImportKeysOperationCallback callback = new ImportKeysOperationCallback(this, inputParcel, null);
mOpHelper = new CryptoOperationHelper<>(1, this, callback, R.string.progress_importing);
mOpHelper.cryptoOperation();

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

@@ -223,7 +223,7 @@ public class ImportKeysProxyActivity extends FragmentActivity
@Override
public ImportKeyringParcel createOperationInput() {
return new ImportKeyringParcel(mKeyList, mKeyserver);
return ImportKeyringParcel.createImportKeyringParcel(mKeyList, mKeyserver);
}
@Override

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

@@ -519,7 +519,7 @@ public class KeyListFragment extends RecyclerFragment<KeySectionedListAdapter>
@Override
public ImportKeyringParcel createOperationInput() {
return new ImportKeyringParcel(mKeyList, mKeyserver);
return ImportKeyringParcel.createImportKeyringParcel(mKeyList, mKeyserver);
}
@Override

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

@@ -185,7 +185,7 @@ public class SafeSlingerActivity extends BaseActivity
@Override
public ImportKeyringParcel createOperationInput() {
return new ImportKeyringParcel(mKeyList, mKeyserver);
return ImportKeyringParcel.createImportKeyringParcel(mKeyList, mKeyserver);
}
@Override

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
View File

@@ -237,7 +237,11 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
keyserver = entry.getKeyserver();
}
return new ImportKeyringParcel(keysList, keyserver, skipSave);
if (skipSave) {
return ImportKeyringParcel.createWithSkipSave(keysList, keyserver);
} else {
return ImportKeyringParcel.createImportKeyringParcel(keysList, keyserver);
}
}
@Override

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

@@ -1176,7 +1176,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
@Override
public ImportKeyringParcel createOperationInput() {
return new ImportKeyringParcel(mKeyList, mKeyserver);
return ImportKeyringParcel.createImportKeyringParcel(mKeyList, mKeyserver);
}
@Override