From b99650b0708c511c2c6f69ce9bc1dad770599b8c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 28 Jun 2016 15:13:53 -0300
Subject: [PATCH] Hide Identity Selector When Adding Contact
Closes #452
---
.../layout-land/fragment_keyagreement_id.xml | 6 ++++--
.../layout-land/invitation_bluetooth_start.xml | 6 ++++--
.../res/layout/fragment_keyagreement_id.xml | 6 ++++--
.../res/layout/invitation_bluetooth_start.xml | 6 ++++--
.../keyagreement/ChooseIdentityFragment.java | 18 ++++++++++++------
5 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/briar-android/res/layout-land/fragment_keyagreement_id.xml b/briar-android/res/layout-land/fragment_keyagreement_id.xml
index 590a76fbf5..01351cd1f8 100644
--- a/briar-android/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout-land/fragment_keyagreement_id.xml
@@ -38,7 +38,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/your_nickname"/>
+ android:text="@string/your_nickname"
+ android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -46,7 +47,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:background="@drawable/spinner_border"
- android:spinnerMode="dropdown"/>
+ android:spinnerMode="dropdown"
+ android:visibility="gone"/>
<TextView
android:id="@+id/faceToFaceView"
diff --git a/briar-android/res/layout-land/invitation_bluetooth_start.xml b/briar-android/res/layout-land/invitation_bluetooth_start.xml
index 1449bad7c9..977e8dfdab 100644
--- a/briar-android/res/layout-land/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout-land/invitation_bluetooth_start.xml
@@ -38,7 +38,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/your_nickname"/>
+ android:text="@string/your_nickname"
+ android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -46,7 +47,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:background="@drawable/spinner_border"
- android:spinnerMode="dropdown"/>
+ android:spinnerMode="dropdown"
+ android:visibility="gone"/>
<TextView
android:id="@+id/faceToFaceView"
diff --git a/briar-android/res/layout/fragment_keyagreement_id.xml b/briar-android/res/layout/fragment_keyagreement_id.xml
index 1885360334..a1c0e2130b 100644
--- a/briar-android/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout/fragment_keyagreement_id.xml
@@ -20,7 +20,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/your_nickname"/>
+ android:text="@string/your_nickname"
+ android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -28,7 +29,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium"
android:background="@drawable/spinner_border"
- android:spinnerMode="dropdown"/>
+ android:spinnerMode="dropdown"
+ android:visibility="gone"/>
<ImageView
android:id="@+id/imageView"
diff --git a/briar-android/res/layout/invitation_bluetooth_start.xml b/briar-android/res/layout/invitation_bluetooth_start.xml
index 7c52215a8b..ef517bf07d 100644
--- a/briar-android/res/layout/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout/invitation_bluetooth_start.xml
@@ -20,7 +20,8 @@
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/your_nickname"/>
+ android:text="@string/your_nickname"
+ android:visibility="gone"/>
<Spinner
android:id="@+id/spinner"
@@ -28,7 +29,8 @@
android:layout_height="wrap_content"
android:background="@drawable/spinner_border"
android:layout_marginTop="@dimen/margin_medium"
- android:spinnerMode="dropdown"/>
+ android:spinnerMode="dropdown"
+ android:visibility="gone"/>
<ImageView
android:id="@+id/imageView"
diff --git a/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java b/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java
index 176a277948..81d284cff0 100644
--- a/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java
+++ b/briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java
@@ -17,7 +17,6 @@ import org.briarproject.android.ActivityComponent;
import org.briarproject.android.fragment.BaseFragment;
import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.identity.LocalAuthorItem;
-import org.briarproject.android.identity.LocalAuthorItemComparator;
import org.briarproject.android.identity.LocalAuthorSpinnerAdapter;
import org.briarproject.api.db.DbException;
import org.briarproject.api.identity.AuthorId;
@@ -146,7 +145,9 @@ public class ChooseIdentityFragment extends BaseFragment
listener.runOnUiThread(new Runnable() {
@Override
public void run() {
- adapter.clear();
+ setLocalAuthorId(authors.iterator().next().getId());
+ // TODO remove comment below when supporting multiple identities
+/* adapter.clear();
for (LocalAuthor a : authors)
adapter.add(new LocalAuthorItem(a));
adapter.sort(LocalAuthorItemComparator.INSTANCE);
@@ -161,13 +162,18 @@ public class ChooseIdentityFragment extends BaseFragment
return;
}
}
- }
+*/ }
});
}
- private void setLocalAuthorId(AuthorId authorId) {
- localAuthorId = authorId;
- button.setEnabled(localAuthorId != null);
+ private void setLocalAuthorId(final AuthorId authorId) {
+ listener.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ localAuthorId = authorId;
+ button.setEnabled(localAuthorId != null);
+ }
+ });
}
@Override
--
GitLab