linked-ids: rename RawLinkedIdentity to UriAttribute

2 files changed, 12 insertions, 12 deletions

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<Integer,RawLinkedIdentity> mLinkedIdentityCache = new WeakHashMap<>();
+    WeakHashMap<Integer,UriAttribute> 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));
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
index c3dcaf239..00eeb5de6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
@@ -36,7 +36,7 @@ import org.sufficientlysecure.keychain.operations.results.LinkedVerifyResult;
 import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
 import org.sufficientlysecure.keychain.linked.LinkedIdentity;
 import org.sufficientlysecure.keychain.linked.LinkedResource;
-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.provider.KeychainDatabase.Tables;
@@ -68,7 +68,7 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
     private static final String ARG_FINGERPRINT = "fingerprint";
     private static final int LOADER_ID_LINKED_ID = 1;
 
-    private RawLinkedIdentity mLinkedId;
+    private UriAttribute mLinkedId;
     private LinkedTokenResource mLinkedResource;
     private boolean mIsSecret;
 
@@ -147,7 +147,7 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
                     int certStatus = cursor.getInt(UserIdsAdapter.INDEX_VERIFIED);
 
                     byte[] data = cursor.getBlob(UserIdsAdapter.INDEX_ATTRIBUTE_DATA);
-                    RawLinkedIdentity linkedId = LinkedIdentity.fromAttributeData(data);
+                    UriAttribute linkedId = LinkedIdentity.fromAttributeData(data);
 
                     loadIdentity(linkedId, certStatus);
 
@@ -186,7 +186,7 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
         mIdLoadedListener = listener;
     }
 
-    private void loadIdentity(RawLinkedIdentity linkedId, int certStatus) {
+    private void loadIdentity(UriAttribute linkedId, int certStatus) {
         mLinkedId = linkedId;
 
         if (mLinkedId instanceof LinkedIdentity) {