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

Show a dialog if the compose button is pressed with no contacts/groups.

Browse Source
This commit is contained in:
akwizgran
2013-04-08 17:23:23 +01:00
parent de472ba2a6
commit 24c4aee47d
8 changed files with 174 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/res/values/strings.xml
View File

@@ -53,4 +53,9 @@
<string name="create_identity_title">Create an Identity</string>
<string name="choose_nickname">Choose your nickname:</string>
<string name="create_button">Create</string>
<string name="no_contacts">You don\'t have any contacts. Add a contact now?</string>
<string name="add_contact_button">Add a contact</string>
<string name="cancel_button">Cancel</string>
<string name="no_groups">You aren\'t subscribed to any groups. Create a group now?</string>
<string name="create_group_button">Create a group</string>
</resources>

36
briar-android/src/net/sf/briar/android/BriarFragmentActivity.java Normal file
View File

@@ -0,0 +1,36 @@
package net.sf.briar.android;
import roboguice.activity.RoboFragmentActivity;
import android.os.Bundle;
/**
* An abstract superclass for activities that overrides the default behaviour
* to prevent sensitive state from being saved unless the subclass explicitly
* saves it.
*/
public class BriarFragmentActivity extends RoboFragmentActivity {
@Override
public void onCreate(Bundle state) {
// Don't pass state through to the superclass
super.onCreate(null);
}
@Override
public void onRestoreInstanceState(Bundle state) {
// Don't pass state through to the superclass
}
@Override
public void onSaveInstanceState(Bundle state) {
// Don't allow the superclass to save state
}
protected void finishOnUiThread() {
runOnUiThread(new Runnable() {
public void run() {
finish();
}
});
}
}

28
briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
View File

@@ -18,7 +18,7 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.R;
import net.sf.briar.android.BriarActivity;
import net.sf.briar.android.BriarFragmentActivity;
import net.sf.briar.android.BriarService;
import net.sf.briar.android.BriarService.BriarServiceConnection;
import net.sf.briar.android.widgets.HorizontalBorder;
@@ -45,8 +45,8 @@ import android.widget.ListView;
import com.google.inject.Inject;
public class GroupListActivity extends BriarActivity
implements OnClickListener, DatabaseListener {
public class GroupListActivity extends BriarFragmentActivity
implements OnClickListener, DatabaseListener, NoGroupsDialog.Listener {
private static final Logger LOG =
Logger.getLogger(GroupListActivity.class.getName());
@@ -62,6 +62,7 @@ implements OnClickListener, DatabaseListener {
@Inject private volatile DatabaseComponent db;
@Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
private volatile boolean restricted = false;
private volatile boolean noGroups = true;
@Override
public void onCreate(Bundle state) {
@@ -135,6 +136,7 @@ implements OnClickListener, DatabaseListener {
for(Group g : db.getSubscriptions()) {
// Filter out restricted/unrestricted groups
if(g.isRestricted() != restricted) continue;
noGroups = false;
try {
// Load the headers from the database
Collection<GroupMessageHeader> headers =
@@ -217,9 +219,15 @@ implements OnClickListener, DatabaseListener {
if(view == newGroupButton) {
// FIXME: Hook this button up to an activity
} else if(view == composeButton) {
Intent i = new Intent(this, WriteGroupMessageActivity.class);
i.putExtra("net.sf.briar.RESTRICTED", restricted);
startActivity(i);
if(noGroups) {
NoGroupsDialog dialog = new NoGroupsDialog();
dialog.setListener(this);
dialog.show(getSupportFragmentManager(), "NoGroupsDialog");
} else {
Intent i = new Intent(this, WriteGroupMessageActivity.class);
i.putExtra("net.sf.briar.RESTRICTED", restricted);
startActivity(i);
}
}
}
@@ -282,6 +290,14 @@ implements OnClickListener, DatabaseListener {
});
}
public void createGroupButtonClicked() {
// FIXME: Hook this button up to an activity
}
public void cancelButtonClicked() {
// That's nice dear
}
private static class GroupComparator implements Comparator<GroupListItem> {
private static final GroupComparator INSTANCE = new GroupComparator();

43
briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java Normal file
View File

@@ -0,0 +1,43 @@
package net.sf.briar.android.groups;
import net.sf.briar.R;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
public class NoGroupsDialog extends DialogFragment {
private Listener listener = null;
void setListener(Listener listener) {
this.listener = listener;
}
@Override
public Dialog onCreateDialog(Bundle state) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(R.string.no_groups);
builder.setPositiveButton(R.string.create_group_button,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
listener.createGroupButtonClicked();
}
});
builder.setNegativeButton(R.string.cancel_button,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
listener.cancelButtonClicked();
}
});
return builder.create();
}
interface Listener {
void createGroupButtonClicked();
void cancelButtonClicked();
}
}

1
briar-android/src/net/sf/briar/android/groups/WriteGroupMessageActivity.java
View File

@@ -213,6 +213,7 @@ implements OnItemSelectedListener, OnClickListener {
private void displayGroups(final Collection<Group> groups) {
runOnUiThread(new Runnable() {
public void run() {
if(groups.isEmpty()) finish();
int index = -1;
for(Group g : groups) {
if(g.getId().equals(groupId)) {

28
briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
View File

@@ -15,9 +15,10 @@ import java.util.concurrent.Executor;
import java.util.logging.Logger;
import net.sf.briar.R;
import net.sf.briar.android.BriarActivity;
import net.sf.briar.android.BriarFragmentActivity;
import net.sf.briar.android.BriarService;
import net.sf.briar.android.BriarService.BriarServiceConnection;
import net.sf.briar.android.invitation.AddContactActivity;
import net.sf.briar.android.widgets.HorizontalBorder;
import net.sf.briar.api.Contact;
import net.sf.briar.api.ContactId;
@@ -41,8 +42,8 @@ import android.widget.ListView;
import com.google.inject.Inject;
public class ConversationListActivity extends BriarActivity
implements OnClickListener, DatabaseListener {
public class ConversationListActivity extends BriarFragmentActivity
implements OnClickListener, DatabaseListener, NoContactsDialog.Listener {
private static final Logger LOG =
Logger.getLogger(ConversationListActivity.class.getName());
@@ -56,6 +57,7 @@ implements OnClickListener, DatabaseListener {
// Fields that are accessed from background threads must be volatile
@Inject private volatile DatabaseComponent db;
@Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
private volatile boolean noContacts = true;
@Override
public void onCreate(Bundle state) {
@@ -103,7 +105,9 @@ implements OnClickListener, DatabaseListener {
serviceConnection.waitForStartup();
// Load the contact list from the database
long now = System.currentTimeMillis();
for(Contact c : db.getContacts()) {
Collection<Contact> contacts = db.getContacts();
noContacts = contacts.isEmpty();
for(Contact c : contacts) {
try {
// Load the headers from the database
Collection<PrivateMessageHeader> headers =
@@ -183,7 +187,13 @@ implements OnClickListener, DatabaseListener {
}
public void onClick(View view) {
startActivity(new Intent(this, WritePrivateMessageActivity.class));
if(noContacts) {
NoContactsDialog dialog = new NoContactsDialog();
dialog.setListener(this);
dialog.show(getSupportFragmentManager(), "NoContactsDialog");
} else {
startActivity(new Intent(this, WritePrivateMessageActivity.class));
}
}
public void eventOccurred(DatabaseEvent e) {
@@ -240,6 +250,14 @@ implements OnClickListener, DatabaseListener {
});
}
public void addContactButtonClicked() {
startActivity(new Intent(this, AddContactActivity.class));
}
public void cancelButtonClicked() {
// That's nice dear
}
private static class ConversationComparator
implements Comparator<ConversationListItem> {

43
briar-android/src/net/sf/briar/android/messages/NoContactsDialog.java Normal file
View File

@@ -0,0 +1,43 @@
package net.sf.briar.android.messages;
import net.sf.briar.R;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
public class NoContactsDialog extends DialogFragment {
private Listener listener = null;
void setListener(Listener listener) {
this.listener = listener;
}
@Override
public Dialog onCreateDialog(Bundle state) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(R.string.no_contacts);
builder.setPositiveButton(R.string.add_contact_button,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
listener.addContactButtonClicked();
}
});
builder.setNegativeButton(R.string.cancel_button,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
listener.cancelButtonClicked();
}
});
return builder.create();
}
interface Listener {
void addContactButtonClicked();
void cancelButtonClicked();
}
}

1
briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
View File

@@ -164,6 +164,7 @@ implements OnItemSelectedListener, OnClickListener {
private void displayContacts(final Collection<Contact> contacts) {
runOnUiThread(new Runnable() {
public void run() {
if(contacts.isEmpty()) finish();
int index = -1;
for(Contact c : contacts) {
if(c.getId().equals(contactId)) index = adapter.getCount();