aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-12 11:56:39 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-12 11:56:39 +0200
commit6fe0a555228bd6fee95cc6f992986f91392ff736 (patch)
treed4c8919e9809dd47bac581a27244a74c5ea15d88 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked
parent20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f (diff)
downloadopen-keychain-6fe0a555228bd6fee95cc6f992986f91392ff736.tar.gz
open-keychain-6fe0a555228bd6fee95cc6f992986f91392ff736.tar.bz2
open-keychain-6fe0a555228bd6fee95cc6f992986f91392ff736.zip
rename LinkedIdentity to LinkedAttribute
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedAttribute.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedIdentity.java)4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/UriAttribute.java4
2 files changed, 4 insertions, 4 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) {