rename LinkedIdentity to LinkedAttribute

5 files changed, 13 insertions, 13 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedIdentity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedAttribute.java
index 11ddb2cea..3b05afbb3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedIdentity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedAttribute.java
@@ -5,11 +5,11 @@ import java.net.URI;
 import android.content.Context;
 import android.support.annotation.DrawableRes;
 
-public class LinkedIdentity extends UriAttribute {
+public class LinkedAttribute extends UriAttribute {
 
     public final LinkedResource mResource;
 
-    protected LinkedIdentity(URI uri, LinkedResource resource) {
+    protected LinkedAttribute(URI uri, LinkedResource resource) {
         super(uri);
         if (resource == null) {
             throw new AssertionError("resource must not be null in a LinkedIdentity!");
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java
index 9bcf84994..7a8ece2cb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java
@@ -47,7 +47,7 @@ public class UriAttribute {
                 return new UriAttribute(uri);
             }
 
-            return new LinkedIdentity(uri, res);
+            return new LinkedAttribute(uri, res);
 
         } catch (IllegalArgumentException e) {
             Log.e(Constants.TAG, "error parsing uri in (suspected) linked id packet");
@@ -69,7 +69,7 @@ public class UriAttribute {
     }
 
     public String getDisplayTitle(Context context) {
-        return "unknown";
+        return "Unknown Identity";
     }
 
     public String getDisplayComment(Context context) {
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 d50c3fd51..805666bb2 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
@@ -33,7 +33,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.LinkedAttribute;
 import org.sufficientlysecure.keychain.linked.UriAttribute;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
@@ -86,7 +86,7 @@ public class LinkedIdsAdapter extends UserAttributesAdapter {
             @Override
             public boolean isVisible(Cursor cursor) {
                 UriAttribute id = getItemAtPosition(cursor);
-                return id instanceof LinkedIdentity;
+                return id instanceof LinkedAttribute;
             }
         };
 
@@ -150,7 +150,7 @@ public class LinkedIdsAdapter extends UserAttributesAdapter {
 
         try {
             byte[] data = cursor.getBlob(INDEX_ATTRIBUTE_DATA);
-            ret = LinkedIdentity.fromAttributeData(data);
+            ret = LinkedAttribute.fromAttributeData(data);
             mLinkedIdentityCache.put(rank, ret);
             return ret;
         } catch (IOException e) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
index 4927064e4..eedc7cdd9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java
@@ -21,7 +21,7 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
 import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
 import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
-import org.sufficientlysecure.keychain.linked.LinkedIdentity;
+import org.sufficientlysecure.keychain.linked.LinkedAttribute;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.ServiceProgressHandler;
@@ -221,7 +221,7 @@ public abstract class LinkedIdCreateFinalFragment extends CryptoOperationFragmen
                 new SaveKeyringParcel(mLinkedIdWizard.mMasterKeyId, mLinkedIdWizard.mFingerprint);
 
         WrappedUserAttribute ua =
-                LinkedIdentity.fromResource(mVerifiedResource).toUserAttribute();
+                LinkedAttribute.fromResource(mVerifiedResource).toUserAttribute();
 
         skp.mAddUserAttribute.add(ua);
 
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 7e9aaf25e..82aaa51c4 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
@@ -34,7 +34,7 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.CertifyResult;
 import org.sufficientlysecure.keychain.operations.results.LinkedVerifyResult;
 import org.sufficientlysecure.keychain.linked.LinkedTokenResource;
-import org.sufficientlysecure.keychain.linked.LinkedIdentity;
+import org.sufficientlysecure.keychain.linked.LinkedAttribute;
 import org.sufficientlysecure.keychain.linked.LinkedResource;
 import org.sufficientlysecure.keychain.linked.UriAttribute;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
@@ -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);
-                    UriAttribute linkedId = LinkedIdentity.fromAttributeData(data);
+                    UriAttribute linkedId = LinkedAttribute.fromAttributeData(data);
 
                     loadIdentity(linkedId, certStatus);
 
@@ -189,8 +189,8 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
     private void loadIdentity(UriAttribute linkedId, int certStatus) {
         mLinkedId = linkedId;
 
-        if (mLinkedId instanceof LinkedIdentity) {
-            LinkedResource res = ((LinkedIdentity) mLinkedId).mResource;
+        if (mLinkedId instanceof LinkedAttribute) {
+            LinkedResource res = ((LinkedAttribute) mLinkedId).mResource;
             mLinkedResource = (LinkedTokenResource) res;
         }