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

ImportKeys: Refactoring (Cache results)

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-01 22:29:48 +02:00
parent 22b5bce165
commit d095df1740
1 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@ import org.sufficientlysecure.keychain.util.ParcelableFileCache;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -69,8 +68,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
private LoaderState mLoaderState; private LoaderState mLoaderState;
private List<ImportKeysListEntry> mData; private List<ImportKeysListEntry> mData;
private HashMap<Integer, CanonicalizedKeyRing> mDownloadedKeyRings; private KeyState[] mKeyStates;
private boolean mCurrentAnimated = true;
private int mCurrent; private int mCurrent;
public ImportKeysAdapter(FragmentActivity activity, ImportKeysListener listener, boolean mNonInteractive) { public ImportKeysAdapter(FragmentActivity activity, ImportKeysListener listener, boolean mNonInteractive) {
@@ -85,13 +83,16 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
public void setData(List<ImportKeysListEntry> data) { public void setData(List<ImportKeysListEntry> data) {
this.mData = data; this.mData = data;
this.mDownloadedKeyRings = new HashMap<>(); this.mKeyStates = new KeyState[data.size()];
for (int i = 0; i < mKeyStates.length; i++) {
mKeyStates[i] = new KeyState();
}
notifyDataSetChanged(); notifyDataSetChanged();
} }
public void clearData() { public void clearData() {
mData = null; mData = null;
mDownloadedKeyRings = null; mKeyStates = null;
notifyDataSetChanged(); notifyDataSetChanged();
} }
@@ -166,7 +167,9 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
State.EXPIRED, R.color.key_flag_gray); State.EXPIRED, R.color.key_flag_gray);
} }
final boolean downloaded = mDownloadedKeyRings.get(position) != null; final KeyState keyState = mKeyStates[position];
final boolean downloaded = keyState.mDownloaded;
final boolean showed = keyState.mShowed;
b.importKey.setOnClickListener(new View.OnClickListener() { b.importKey.setOnClickListener(new View.OnClickListener() {
@Override @Override
@@ -184,33 +187,28 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mCurrent = position; mCurrent = position;
if (!downloaded) { if (!showed && !downloaded) {
getKey(entry); getKey(entry);
} else { } else {
removeKey(); changeState(position, !showed);
} }
} }
}); });
float rotation = downloaded ? 180 : 0; float rotation = showed ? 180 : 0;
if ((mCurrent == position) && (!mCurrentAnimated)) { if (!keyState.mAnimated) {
mCurrentAnimated = !mCurrentAnimated; keyState.mAnimated = true;
float oldRotation = !downloaded ? 180 : 0; float oldRotation = !showed ? 180 : 0;
b.expand.setRotation(oldRotation); b.expand.setRotation(oldRotation);
b.expand.animate().rotation(rotation).start(); b.expand.animate().rotation(rotation).start();
} else { } else {
b.expand.setRotation(rotation); b.expand.setRotation(rotation);
} }
b.extraContainer.setVisibility(downloaded ? View.VISIBLE : View.GONE);
b.userIdsList.removeAllViews(); b.extraContainer.setVisibility(showed ? View.VISIBLE : View.GONE);
if (downloaded) { if (showed) {
b.userIdsList.removeAllViews();
// we want conventional gpg UserIDs first, then Keybase ”proofs” // we want conventional gpg UserIDs first, then Keybase ”proofs”
ArrayList<String> realUserIdsPlusKeybase = entry.getKeybaseUserIds();
CanonicalizedKeyRing keyRing = mDownloadedKeyRings.get(position);
realUserIdsPlusKeybase.addAll(keyRing.getUnorderedUserIds());
entry.setUserIds(realUserIdsPlusKeybase);
ArrayList<Map.Entry<String, HashSet<String>>> sortedIds = entry.getSortedUserIds(); ArrayList<Map.Entry<String, HashSet<String>>> sortedIds = entry.getSortedUserIds();
for (Map.Entry<String, HashSet<String>> pair : sortedIds) { for (Map.Entry<String, HashSet<String>> pair : sortedIds) {
String cUserId = pair.getKey(); String cUserId = pair.getKey();
@@ -228,7 +226,6 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
} else { } else {
uidView.setTextColor(FormattingUtils.getColorFromAttr(mActivity, R.attr.colorText)); uidView.setTextColor(FormattingUtils.getColorFromAttr(mActivity, R.attr.colorText));
} }
b.userIdsList.addView(uidView); b.userIdsList.addView(uidView);
for (String email : cEmails) { for (String email : cEmails) {
@@ -244,7 +241,6 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
} else { } else {
emailView.setTextColor(FormattingUtils.getColorFromAttr(mActivity, R.attr.colorText)); emailView.setTextColor(FormattingUtils.getColorFromAttr(mActivity, R.attr.colorText));
} }
b.userIdsList.addView(emailView); b.userIdsList.addView(emailView);
} }
} }
@@ -305,12 +301,6 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
return new ImportKeyringParcel(keysList, keyserver, skipSave); return new ImportKeyringParcel(keysList, keyserver, skipSave);
} }
public void removeKey() {
mCurrentAnimated = false;
mDownloadedKeyRings.remove(mCurrent);
notifyItemChanged(mCurrent);
}
@Override @Override
public void handleResult(ImportKeyResult result) { public void handleResult(ImportKeyResult result) {
boolean resultStatus = result.success(); boolean resultStatus = result.success();
@@ -321,13 +311,32 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
CanonicalizedKeyRing keyRing = canKeyRings.get(0); CanonicalizedKeyRing keyRing = canKeyRings.get(0);
Log.e(Constants.TAG, "Key ID: " + keyRing.getMasterKeyId() + Log.e(Constants.TAG, "Key ID: " + keyRing.getMasterKeyId() +
"| isRev: " + keyRing.isRevoked() + "| isExp: " + keyRing.isExpired()); "| isRev: " + keyRing.isRevoked() + "| isExp: " + keyRing.isExpired());
mCurrentAnimated = false;
mDownloadedKeyRings.put(mCurrent, keyRing); ImportKeysListEntry entry = mData.get(mCurrent);
notifyItemChanged(mCurrent);
ArrayList<String> realUserIdsPlusKeybase = keyRing.getUnorderedUserIds();
realUserIdsPlusKeybase.addAll(entry.getKeybaseUserIds());
entry.setUserIds(realUserIdsPlusKeybase);
mKeyStates[mCurrent].mDownloaded = true;
changeState(mCurrent, true);
} else { } else {
throw new RuntimeException("getKey retrieved more than one key."); throw new RuntimeException("getKey retrieved more than one key.");
} }
} }
} }
private class KeyState {
public boolean mDownloaded = false;
public boolean mShowed = false;
public boolean mAnimated = true;
}
private void changeState(int position, boolean showed) {
KeyState keyState = mKeyStates[position];
keyState.mShowed = showed;
keyState.mAnimated = true;
notifyItemChanged(position);
}
} }