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

use autovalue for ParcelableKeyRing

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-05-28 21:54:56 +02:00
parent 606c702762
commit 27f6f4ef6c
15 changed files with 52 additions and 88 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

@@ -215,7 +215,7 @@ public class CreateSecurityTokenImportResetFragment
public void importKey() {
ArrayList<ParcelableKeyRing> keyList = new ArrayList<>();
keyList.add(new ParcelableKeyRing(mTokenFingerprint, null, null, null));
keyList.add(ParcelableKeyRing.createFromReference(mTokenFingerprint, null, null, null));
mKeyList = keyList;
mKeyserver = Preferences.getPreferences(getActivity()).getPreferredKeyserver();

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

@@ -146,7 +146,7 @@ public abstract class DecryptFragment extends Fragment implements LoaderManager.
keyserver = Preferences.getPreferences(getActivity()).getPreferredKeyserver();
{
ParcelableKeyRing keyEntry = new ParcelableKeyRing(null,
ParcelableKeyRing keyEntry = ParcelableKeyRing.createFromReference(null,
KeyFormattingUtils.convertKeyIdToHex(unknownKeyId), null, null);
ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
selectedEntries.add(keyEntry);

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

@@ -766,7 +766,7 @@ public class DecryptListFragment
keyserver = Preferences.getPreferences(getActivity()).getPreferredKeyserver();
{
ParcelableKeyRing keyEntry = new ParcelableKeyRing(null,
ParcelableKeyRing keyEntry = ParcelableKeyRing.createFromReference(null,
KeyFormattingUtils.convertKeyIdToHex(unknownKeyId), null, null);
ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
selectedEntries.add(keyEntry);

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

@@ -191,7 +191,7 @@ public class ImportKeysProxyActivity extends FragmentActivity
}
public void importKeys(byte[] keyringData) {
ParcelableKeyRing keyEntry = new ParcelableKeyRing(keyringData);
ParcelableKeyRing keyEntry = ParcelableKeyRing.createFromEncodedBytes(keyringData);
ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
selectedEntries.add(keyEntry);
@@ -199,7 +199,7 @@ public class ImportKeysProxyActivity extends FragmentActivity
}
public void importKeysFromFingerprint(byte[] fingerprint) {
ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null, null);
ParcelableKeyRing keyEntry = ParcelableKeyRing.createFromReference(fingerprint, null, null, null);
ArrayList<ParcelableKeyRing> selectedEntries = new ArrayList<>();
selectedEntries.add(keyEntry);

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

@@ -503,7 +503,7 @@ public class KeyListFragment extends RecyclerFragment<KeySectionedListAdapter>
try {
while (cursor.moveToNext()) {
byte[] fingerprint = cursor.getBlob(0); //fingerprint column is 0
ParcelableKeyRing keyEntry = new ParcelableKeyRing(fingerprint, null, null, null);
ParcelableKeyRing keyEntry = ParcelableKeyRing.createFromReference(fingerprint, null, null, null);
keyList.add(keyEntry);
}
mKeyList = keyList;

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

@@ -172,7 +172,7 @@ public class SafeSlingerActivity extends BaseActivity
do {
d = extras.getByteArray(ExchangeConfig.extra.MEMBER_DATA + i);
if (d != null) {
list.add(new ParcelableKeyRing(d));
list.add(ParcelableKeyRing.createFromEncodedBytes(d));
i++;
}
} while (d != null);

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

@@ -222,7 +222,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
ParcelableHkpKeyserver keyserver = null;
ParcelableKeyRing keyRing = entry.getParcelableKeyRing();
if (keyRing.mBytes != null) {
if (keyRing.getBytes() != null) {
// 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.

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

@@ -1163,7 +1163,7 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
byte[] blob = keyRepository.getCachedPublicKeyRing(dataUri).getFingerprint();
ParcelableKeyRing keyEntry = new ParcelableKeyRing(blob, null, null, null);
ParcelableKeyRing keyEntry = ParcelableKeyRing.createFromReference(blob, null, null, null);
ArrayList<ParcelableKeyRing> entries = new ArrayList<>();
entries.add(keyEntry);
mKeyList = entries;