From 24c4aee47df4d6400602dcb5cdf4a4f3d6fe9d9a Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 8 Apr 2013 17:23:23 +0100
Subject: [PATCH] Show a dialog if the compose button is pressed with no
contacts/groups.
---
briar-android/res/values/strings.xml | 5 +++
.../briar/android/BriarFragmentActivity.java | 36 ++++++++++++++++
.../android/groups/GroupListActivity.java | 28 +++++++++---
.../briar/android/groups/NoGroupsDialog.java | 43 +++++++++++++++++++
.../groups/WriteGroupMessageActivity.java | 1 +
.../messages/ConversationListActivity.java | 28 +++++++++---
.../android/messages/NoContactsDialog.java | 43 +++++++++++++++++++
.../messages/WritePrivateMessageActivity.java | 1 +
8 files changed, 174 insertions(+), 11 deletions(-)
create mode 100644 briar-android/src/net/sf/briar/android/BriarFragmentActivity.java
create mode 100644 briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java
create mode 100644 briar-android/src/net/sf/briar/android/messages/NoContactsDialog.java
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index 93f292b471..c7aa5a7d6e 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -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>
diff --git a/briar-android/src/net/sf/briar/android/BriarFragmentActivity.java b/briar-android/src/net/sf/briar/android/BriarFragmentActivity.java
new file mode 100644
index 0000000000..44809a3bf2
--- /dev/null
+++ b/briar-android/src/net/sf/briar/android/BriarFragmentActivity.java
@@ -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();
+ }
+ });
+ }
+}
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
index 0d7b970145..f13fce4f69 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java
@@ -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();
diff --git a/briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java b/briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java
new file mode 100644
index 0000000000..59cd5c270c
--- /dev/null
+++ b/briar-android/src/net/sf/briar/android/groups/NoGroupsDialog.java
@@ -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();
+ }
+}
diff --git a/briar-android/src/net/sf/briar/android/groups/WriteGroupMessageActivity.java b/briar-android/src/net/sf/briar/android/groups/WriteGroupMessageActivity.java
index e887fc6561..976bbb84b7 100644
--- a/briar-android/src/net/sf/briar/android/groups/WriteGroupMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/WriteGroupMessageActivity.java
@@ -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)) {
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
index 8fdc82aa33..950afba1c8 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java
@@ -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> {
diff --git a/briar-android/src/net/sf/briar/android/messages/NoContactsDialog.java b/briar-android/src/net/sf/briar/android/messages/NoContactsDialog.java
new file mode 100644
index 0000000000..d04aa9e84f
--- /dev/null
+++ b/briar-android/src/net/sf/briar/android/messages/NoContactsDialog.java
@@ -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();
+ }
+}
diff --git a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
index c6480e0ac4..f3d714e070 100644
--- a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java
@@ -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();
--
GitLab