Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '452-hide-identities-initially' into 'master'

Browse Source 
Hide Identity Selector When Adding Contact

Closes #452

See merge request !233
This commit is contained in:
Ernir Erlingsson
2016-07-06 20:29:18 +00:00
parent ba86690ce0 b99650b070
commit e9789435cc
5 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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