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

Distinguish request and result codes of different activities.

Browse Source
This commit is contained in:
akwizgran
2014-02-05 15:03:28 +00:00
parent 8d850b290c
commit 843ad55163
8 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -6,6 +6,7 @@ import static android.view.View.VISIBLE;
import static android.widget.LinearLayout.VERTICAL;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.contact.ReadPrivateMessageActivity.RESULT_PREV_NEXT;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_MATCH;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP_1;
@@ -47,6 +48,7 @@ import android.widget.ListView;
public class ConversationActivity extends RoboActivity
implements EventListener, OnClickListener, OnItemClickListener {
private static final int REQUEST_READ_MESSAGE = 2;
private static final Logger LOG =
Logger.getLogger(ConversationActivity.class.getName());
@@ -180,12 +182,10 @@ implements EventListener, OnClickListener, OnItemClickListener {
@Override
public void onActivityResult(int request, int result, Intent data) {
if(result == ReadPrivateMessageActivity.RESULT_PREV) {
int position = request - 1;
if(position >= 0 && position < adapter.getCount())
displayMessage(position);
} else if(result == ReadPrivateMessageActivity.RESULT_NEXT) {
int position = request + 1;
super.onActivityResult(request, result, data);
if(request == REQUEST_READ_MESSAGE && result == RESULT_PREV_NEXT) {
int position = data.getIntExtra("briar.POSITION", -1);
if(position == -1) throw new IllegalStateException();
if(position >= 0 && position < adapter.getCount())
displayMessage(position);
}
@@ -244,6 +244,7 @@ implements EventListener, OnClickListener, OnItemClickListener {
i.putExtra("briar.MESSAGE_ID", header.getId().getBytes());
i.putExtra("briar.CONTENT_TYPE", header.getContentType());
i.putExtra("briar.TIMESTAMP", header.getTimestamp());
startActivityForResult(i, position);
i.putExtra("briar.POSITION", position);
startActivityForResult(i, REQUEST_READ_MESSAGE);
}
}

14
briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
View File

@@ -48,8 +48,7 @@ public class ReadPrivateMessageActivity extends RoboActivity
implements OnClickListener {
static final int RESULT_REPLY = RESULT_FIRST_USER;
static final int RESULT_PREV = RESULT_FIRST_USER + 1;
static final int RESULT_NEXT = RESULT_FIRST_USER + 2;
static final int RESULT_PREV_NEXT = RESULT_FIRST_USER + 1;
private static final Logger LOG =
Logger.getLogger(ReadPrivateMessageActivity.class.getName());
@@ -60,6 +59,7 @@ implements OnClickListener {
private ImageButton readButton = null, prevButton = null, nextButton = null;
private ImageButton replyButton = null;
private TextView content = null;
private int position = -1;
// Fields that are accessed from background threads must be volatile
@Inject private volatile DatabaseComponent db;
@@ -92,6 +92,8 @@ implements OnClickListener {
if(contentType == null) throw new IllegalStateException();
timestamp = i.getLongExtra("briar.TIMESTAMP", -1);
if(timestamp == -1) throw new IllegalStateException();
position = i.getIntExtra("briar.POSITION", -1);
if(position == -1) throw new IllegalStateException();
if(state == null) {
read = false;
@@ -262,10 +264,14 @@ implements OnClickListener {
if(view == readButton) {
setReadInDatabase(!read);
} else if(view == prevButton) {
setResult(RESULT_PREV);
Intent i = new Intent();
i.putExtra("briar.POSITION", position - 1);
setResult(RESULT_PREV_NEXT, i);
finish();
} else if(view == nextButton) {
setResult(RESULT_NEXT);
Intent i = new Intent();
i.putExtra("briar.POSITION", position + 1);
setResult(RESULT_PREV_NEXT, i);
finish();
} else if(view == replyButton) {
Intent i = new Intent(this, WritePrivateMessageActivity.class);