cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linked: disable DNS resource (for now)

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-08-31 13:40:22 +02:00
parent bff302f808
commit ee81018163
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/LinkedTokenResource.java
View File

@@ -117,10 +117,10 @@ public abstract class LinkedTokenResource extends LinkedResource {
if (res != null) { if (res != null) {
return res; return res;
} }
res = DnsResource.create(flags, params, subUri); // res = DnsResource.create(flags, params, subUri);
if (res != null) { // if (res != null) {
return res; // return res;
} // }
res = TwitterResource.create(flags, params, subUri); res = TwitterResource.create(flags, params, subUri);
if (res != null) { if (res != null) {
return res; return res;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdSelectFragment.java
View File

@@ -56,6 +56,7 @@ public class LinkedIdSelectFragment extends Fragment {
} }
}); });
/*
view.findViewById(R.id.linked_create_dns_button) view.findViewById(R.id.linked_create_dns_button)
.setOnClickListener(new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {
@Override @Override
@@ -66,6 +67,7 @@ public class LinkedIdSelectFragment extends Fragment {
mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT); mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT);
} }
}); });
*/
view.findViewById(R.id.linked_create_twitter_button) view.findViewById(R.id.linked_create_twitter_button)
.setOnClickListener(new View.OnClickListener() { .setOnClickListener(new View.OnClickListener() {

4
OpenKeychain/src/main/res/layout/linked_select_fragment.xml
View File

@@ -72,6 +72,7 @@
</LinearLayout> </LinearLayout>
<!--
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dip" android:layout_height="1dip"
@@ -86,7 +87,7 @@
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- separate ImageView required for recoloring --> <!- separate ImageView required for recoloring ->
<ImageView <ImageView
android:layout_width="60dip" android:layout_width="60dip"
android:layout_height="60dip" android:layout_height="60dip"
@@ -106,6 +107,7 @@
android:gravity="center_vertical" /> android:gravity="center_vertical" />
</LinearLayout> </LinearLayout>
-->
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"