From 3600cda3bcf1797db60c870a5fa582a27856e666 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 9 May 2015 19:09:09 +0200 Subject: linked-ids: rename RawLinkedIdentity to UriAttribute --- .../keychain/ui/adapter/LinkedIdsAdapter.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java index bc49e9a78..d50c3fd51 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java @@ -34,7 +34,7 @@ import android.widget.TextView; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.linked.LinkedIdentity; -import org.sufficientlysecure.keychain.linked.RawLinkedIdentity; +import org.sufficientlysecure.keychain.linked.UriAttribute; import org.sufficientlysecure.keychain.provider.KeychainContract.Certs; import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets; import org.sufficientlysecure.keychain.ui.linked.LinkedIdViewFragment; @@ -49,7 +49,7 @@ import java.util.WeakHashMap; public class LinkedIdsAdapter extends UserAttributesAdapter { private final boolean mIsSecret; protected LayoutInflater mInflater; - WeakHashMap mLinkedIdentityCache = new WeakHashMap<>(); + WeakHashMap mLinkedIdentityCache = new WeakHashMap<>(); private Cursor mUnfilteredCursor; @@ -85,7 +85,7 @@ public class LinkedIdsAdapter extends UserAttributesAdapter { FilterCursorWrapper filteredCursor = new FilterCursorWrapper(cursor) { @Override public boolean isVisible(Cursor cursor) { - RawLinkedIdentity id = getItemAtPosition(cursor); + UriAttribute id = getItemAtPosition(cursor); return id instanceof LinkedIdentity; } }; @@ -132,16 +132,16 @@ public class LinkedIdsAdapter extends UserAttributesAdapter { } } - RawLinkedIdentity id = getItemAtPosition(cursor); + UriAttribute id = getItemAtPosition(cursor); holder.setData(mContext, id); } - public RawLinkedIdentity getItemAtPosition(Cursor cursor) { + public UriAttribute getItemAtPosition(Cursor cursor) { int rank = cursor.getInt(INDEX_RANK); Log.d(Constants.TAG, "requested rank: " + rank); - RawLinkedIdentity ret = mLinkedIdentityCache.get(rank); + UriAttribute ret = mLinkedIdentityCache.get(rank); if (ret != null) { Log.d(Constants.TAG, "cached!"); return ret; @@ -160,7 +160,7 @@ public class LinkedIdsAdapter extends UserAttributesAdapter { } @Override - public RawLinkedIdentity getItem(int position) { + public UriAttribute getItem(int position) { Cursor cursor = getCursor(); cursor.moveToPosition(position); return getItemAtPosition(cursor); @@ -206,7 +206,7 @@ public class LinkedIdsAdapter extends UserAttributesAdapter { vComment = (TextView) view.findViewById(R.id.linked_id_comment); } - public void setData(Context context, RawLinkedIdentity id) { + public void setData(Context context, UriAttribute id) { vTitle.setText(id.getDisplayTitle(context)); -- cgit v1.2.3