From 1f169dd160fb1cbc3d6be6e98e89d7ed0c1601c3 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Sun, 9 Feb 2014 12:11:39 +0000
Subject: [PATCH] Refactored finishOnUiThread() into superclass.
---
.../src/org/briarproject/android/BriarActivity.java | 8 ++++++++
.../android/contact/ConversationActivity.java | 8 --------
.../android/contact/ReadPrivateMessageActivity.java | 6 +-----
.../android/contact/WritePrivateMessageActivity.java | 4 ++--
.../android/groups/ConfigureGroupActivity.java | 6 +-----
.../briarproject/android/groups/CreateGroupActivity.java | 6 +-----
.../org/briarproject/android/groups/GroupActivity.java | 8 --------
.../src/org/briarproject/android/groups/GroupAdapter.java | 1 -
.../android/groups/ReadGroupPostActivity.java | 6 +-----
9 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java
index 5fe5525178..3b6ad77e94 100644
--- a/briar-android/src/org/briarproject/android/BriarActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarActivity.java
@@ -95,4 +95,12 @@ public class BriarActivity extends RoboFragmentActivity {
}
}.start();
}
+
+ protected void finishOnUiThread() {
+ runOnUiThread(new Runnable() {
+ public void run() {
+ finish();
+ }
+ });
+ }
}
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index f466ff48ae..4fb17c5998 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -220,14 +220,6 @@ implements EventListener, OnClickListener, OnItemClickListener {
});
}
- private void finishOnUiThread() {
- runOnUiThread(new Runnable() {
- public void run() {
- finish();
- }
- });
- }
-
@Override
protected void onActivityResult(int request, int result, Intent data) {
super.onActivityResult(request, result, data);
diff --git a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
index 717c682d63..7b223a7f27 100644
--- a/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
@@ -235,11 +235,7 @@ implements OnClickListener {
});
} catch(NoSuchMessageException e) {
if(LOG.isLoggable(INFO)) LOG.info("Message removed");
- runOnUiThread(new Runnable() {
- public void run() {
- finish();
- }
- });
+ finishOnUiThread();
} catch(DbException e) {
if(LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
diff --git a/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java b/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java
index 4f44edd918..48e9451b74 100644
--- a/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/WritePrivateMessageActivity.java
@@ -166,9 +166,9 @@ implements OnClickListener {
LOG.info("Load took " + duration + " ms");
displayLocalAuthor();
} catch(NoSuchContactException e) {
- finish();
+ finishOnUiThread();
} catch(NoSuchSubscriptionException e) {
- finish();
+ finishOnUiThread();
} catch(DbException e) {
if(LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
diff --git a/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java b/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
index 205d37c83f..e512112397 100644
--- a/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/ConfigureGroupActivity.java
@@ -225,11 +225,7 @@ SelectContactsDialog.Listener {
LOG.info("Interrupted while waiting for database");
Thread.currentThread().interrupt();
}
- runOnUiThread(new Runnable() {
- public void run() {
- finish();
- }
- });
+ finishOnUiThread();
}
});
}
diff --git a/briar-android/src/org/briarproject/android/groups/CreateGroupActivity.java b/briar-android/src/org/briarproject/android/groups/CreateGroupActivity.java
index 132663dc78..78dfd0e7d6 100644
--- a/briar-android/src/org/briarproject/android/groups/CreateGroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/CreateGroupActivity.java
@@ -195,11 +195,7 @@ SelectContactsDialog.Listener {
LOG.info("Interrupted while waiting for database");
Thread.currentThread().interrupt();
}
- runOnUiThread(new Runnable() {
- public void run() {
- finish();
- }
- });
+ finishOnUiThread();
}
});
}
diff --git a/briar-android/src/org/briarproject/android/groups/GroupActivity.java b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
index 36a78cf97c..65d640a8b5 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupActivity.java
@@ -226,14 +226,6 @@ OnClickListener, OnItemClickListener {
});
}
- private void finishOnUiThread() {
- runOnUiThread(new Runnable() {
- public void run() {
- finish();
- }
- });
- }
-
@Override
protected void onActivityResult(int request, int result, Intent data) {
super.onActivityResult(request, result, data);
diff --git a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
index 72de5bee56..bbe7d677ca 100644
--- a/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
+++ b/briar-android/src/org/briarproject/android/groups/GroupAdapter.java
@@ -58,7 +58,6 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
else authorView.init(author.getName(), header.getAuthorStatus());
headerLayout.addView(authorView);
- // FIXME: Factor this out into a TimestampView
TextView date = new TextView(ctx);
date.setTextSize(14);
date.setPadding(0, pad, pad, pad);
diff --git a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
index 41480c2bc4..6118588c9d 100644
--- a/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
@@ -231,11 +231,7 @@ implements OnClickListener {
});
} catch(NoSuchMessageException e) {
if(LOG.isLoggable(INFO)) LOG.info("Message removed");
- runOnUiThread(new Runnable() {
- public void run() {
- finish();
- }
- });
+ finishOnUiThread();
} catch(DbException e) {
if(LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
--
GitLab