Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Hide Identity Selector When Adding Contact

Browse Source 
Closes #452
This commit is contained in:
Torsten Grote
2016-06-28 15:13:53 -03:00
parent 3ae3fdab63
commit b99650b070
5 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/res/layout-land/fragment_keyagreement_id.xml
View File

@@ -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"

6
briar-android/res/layout-land/invitation_bluetooth_start.xml
View File

@@ -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"

6
briar-android/res/layout/fragment_keyagreement_id.xml
View File

@@ -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"

6
briar-android/res/layout/invitation_bluetooth_start.xml
View File

@@ -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"

18
briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java
View File

@@ -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