aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java8
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdSelectFragment.java2
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
index 61e275166..998ec3ad4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
@@ -117,10 +117,10 @@ public abstract class LinkedTokenResource extends LinkedResource {
if (res != null) {
return res;
}
- res = DnsResource.create(flags, params, subUri);
- if (res != null) {
- return res;
- }
+ // res = DnsResource.create(flags, params, subUri);
+ // if (res != null) {
+ // return res;
+ // }
res = TwitterResource.create(flags, params, subUri);
if (res != null) {
return res;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdSelectFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdSelectFragment.java
index 8249f0bb6..947ebb52f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdSelectFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdSelectFragment.java
@@ -56,6 +56,7 @@ public class LinkedIdSelectFragment extends Fragment {
}
});
+ /*
view.findViewById(R.id.linked_create_dns_button)
.setOnClickListener(new View.OnClickListener() {
@Override
@@ -66,6 +67,7 @@ public class LinkedIdSelectFragment extends Fragment {
mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT);
}
});
+ */
view.findViewById(R.id.linked_create_twitter_button)
.setOnClickListener(new View.OnClickListener() {