Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Fixed NullPointerException in ConfigureGroupActivity. Bug #63.

Browse Source
This commit is contained in:
akwizgran
2014-03-22 12:25:04 +00:00
parent fc66f6ed8a
commit 86ebae04b4
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
View File

@@ -50,6 +50,7 @@ SelectContactsDialog.Listener {
private RadioButton visibleToAll = null, visibleToSome = null; private RadioButton visibleToAll = null, visibleToSome = null;
private Button doneButton = null; private Button doneButton = null;
private ProgressBar progress = null; private ProgressBar progress = null;
private boolean changed = false;
// Fields that are accessed from background threads must be volatile // Fields that are accessed from background threads must be volatile
@Inject private volatile DatabaseComponent db; @Inject private volatile DatabaseComponent db;
@@ -128,20 +129,28 @@ SelectContactsDialog.Listener {
public void onClick(View view) { public void onClick(View view) {
if(view == subscribeCheckBox) { if(view == subscribeCheckBox) {
changed = true;
boolean subscribe = subscribeCheckBox.isChecked(); boolean subscribe = subscribeCheckBox.isChecked();
visibleToAll.setEnabled(subscribe); visibleToAll.setEnabled(subscribe);
visibleToSome.setEnabled(subscribe); visibleToSome.setEnabled(subscribe);
} else if(view == visibleToAll) {
changed = true;
} else if(view == visibleToSome) { } else if(view == visibleToSome) {
changed = true;
if(contacts == null) loadContacts(); if(contacts == null) loadContacts();
else displayContacts(); else displayContacts();
} else if(view == doneButton) { } else if(view == doneButton) {
boolean subscribe = subscribeCheckBox.isChecked(); if(changed) {
boolean all = visibleToAll.isChecked(); boolean subscribe = subscribeCheckBox.isChecked();
// Replace the button with a progress bar boolean all = visibleToAll.isChecked();
doneButton.setVisibility(GONE); // Replace the button with a progress bar
progress.setVisibility(VISIBLE); doneButton.setVisibility(GONE);
// Update the blog in a background thread progress.setVisibility(VISIBLE);
if(subscribe || subscribed) updateGroup(subscribe, all); // Update the blog in a background thread
if(subscribe || subscribed) updateGroup(subscribe, all);
} else {
finish();
}
} }
} }