diff --git a/briar-android/res/drawable-hdpi/rating_bad.png b/briar-android/res/drawable-hdpi/rating_bad.png
deleted file mode 100644
index 4d332cc92e47bbaaa094105944721a7400b6abe4..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-hdpi/rating_bad.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/rating_good.png b/briar-android/res/drawable-hdpi/rating_good.png
deleted file mode 100644
index f612bab60e2553211c7c55a836ccac63fc44951d..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-hdpi/rating_good.png and /dev/null differ
diff --git a/briar-android/res/drawable-hdpi/rating_unrated.png b/briar-android/res/drawable-hdpi/rating_unrated.png
deleted file mode 100644
index 6b289165b9ee64f59cfc93f336fb61c648ffc171..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-hdpi/rating_unrated.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/rating_bad.png b/briar-android/res/drawable-mdpi/rating_bad.png
deleted file mode 100644
index 5c5982ac649369ba8fa4c379c462a0f550ff2903..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-mdpi/rating_bad.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/rating_good.png b/briar-android/res/drawable-mdpi/rating_good.png
deleted file mode 100644
index 16fce26e1c2e484a855638960cca2ddebb93f115..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-mdpi/rating_good.png and /dev/null differ
diff --git a/briar-android/res/drawable-mdpi/rating_unrated.png b/briar-android/res/drawable-mdpi/rating_unrated.png
deleted file mode 100644
index 19521e83c158602004663dc8030d8b31788d5ee0..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-mdpi/rating_unrated.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/rating_bad.png b/briar-android/res/drawable-xhdpi/rating_bad.png
deleted file mode 100644
index a8ad06ad9926fb4948f790f4699b1dd740c47d4c..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-xhdpi/rating_bad.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/rating_good.png b/briar-android/res/drawable-xhdpi/rating_good.png
deleted file mode 100644
index 225eaea5f258984ccc6d015598dc431e9af8978a..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-xhdpi/rating_good.png and /dev/null differ
diff --git a/briar-android/res/drawable-xhdpi/rating_unrated.png b/briar-android/res/drawable-xhdpi/rating_unrated.png
deleted file mode 100644
index 992827ce7f8095cc7fca8c638126832a043f74c3..0000000000000000000000000000000000000000
Binary files a/briar-android/res/drawable-xhdpi/rating_unrated.png and /dev/null differ
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
index 49c125ef43585a57b17e70c9655707142e207588..7819438028dc6e96c6ac877fb05923bf5af00a19 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java
@@ -29,7 +29,6 @@ import net.sf.briar.api.db.event.DatabaseEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.GroupMessageAddedEvent;
import net.sf.briar.api.db.event.MessageExpiredEvent;
-import net.sf.briar.api.db.event.RatingChangedEvent;
import net.sf.briar.api.db.event.SubscriptionRemovedEvent;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
@@ -197,9 +196,6 @@ OnClickListener, OnItemClickListener {
} else if(e instanceof MessageExpiredEvent) {
if(LOG.isLoggable(INFO)) LOG.info("Message expired, reloading");
loadHeaders();
- } else if(e instanceof RatingChangedEvent) {
- if(LOG.isLoggable(INFO)) LOG.info("Rating changed, reloading");
- loadHeaders();
} else if(e instanceof SubscriptionRemovedEvent) {
SubscriptionRemovedEvent s = (SubscriptionRemovedEvent) e;
if(s.getGroup().getId().equals(groupId)) {
@@ -234,7 +230,6 @@ OnClickListener, OnItemClickListener {
if(author != null) {
i.putExtra("net.sf.briar.AUTHOR_ID", author.getId().getBytes());
i.putExtra("net.sf.briar.AUTHOR_NAME", author.getName());
- i.putExtra("net.sf.briar.RATING", item.getRating().toString());
}
i.putExtra("net.sf.briar.CONTENT_TYPE", item.getContentType());
i.putExtra("net.sf.briar.TIMESTAMP", item.getTimestamp());
diff --git a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
index 7f2cd71ab171db1c81b0e4294e034273270eb069..4fa1e1af53b1200792bcf09bf731ea57bbc3bf2d 100644
--- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
+++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java
@@ -6,8 +6,6 @@ import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
import java.util.ArrayList;
@@ -15,7 +13,6 @@ import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.Author;
import net.sf.briar.api.db.GroupMessageHeader;
-import net.sf.briar.api.messaging.Rating;
import android.content.Context;
import android.content.res.Resources;
import android.text.format.DateUtils;
@@ -49,24 +46,17 @@ class GroupAdapter extends ArrayAdapter<GroupMessageHeader> {
innerLayout.setLayoutParams(WRAP_WRAP_1);
innerLayout.setOrientation(VERTICAL);
+ // FIXME: Can this layout be removed?
LinearLayout authorLayout = new LinearLayout(ctx);
authorLayout.setOrientation(HORIZONTAL);
authorLayout.setGravity(CENTER_VERTICAL);
- ImageView thumb = new ImageView(ctx);
- thumb.setPadding(5, 5, 5, 5);
- Rating rating = item.getRating();
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- authorLayout.addView(thumb);
-
TextView name = new TextView(ctx);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
Author author = item.getAuthor();
if(author == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
index 8ce4f8a4c4d3f06d90c7dc86e84fa853874b2fbd..2f627224181df5cbcffa7f719f40f983a7020afd 100644
--- a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
+++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java
@@ -10,9 +10,6 @@ import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
-import static net.sf.briar.api.messaging.Rating.UNRATED;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Executor;
@@ -21,7 +18,6 @@ import java.util.logging.Logger;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalBorder;
import net.sf.briar.android.util.HorizontalSpace;
-import net.sf.briar.api.AuthorId;
import net.sf.briar.api.android.DatabaseUiExecutor;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
@@ -29,7 +25,6 @@ import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.GroupId;
import net.sf.briar.api.messaging.MessageId;
-import net.sf.briar.api.messaging.Rating;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -38,7 +33,6 @@ import android.text.format.DateUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
-import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -56,11 +50,8 @@ implements OnClickListener {
Logger.getLogger(ReadGroupPostActivity.class.getName());
private GroupId groupId = null;
- private Rating rating = UNRATED;
private boolean read;
- private ImageView thumb = null;
- private ImageButton goodButton = null, badButton = null, readButton = null;
- private ImageButton prevButton = null, nextButton = null;
+ private ImageButton readButton = null, prevButton = null, nextButton = null;
private ImageButton replyButton = null;
private TextView content = null;
@@ -69,7 +60,6 @@ implements OnClickListener {
@Inject @DatabaseUiExecutor private volatile Executor dbUiExecutor;
@Inject private volatile LifecycleManager lifecycleManager;
private volatile MessageId messageId = null;
- private volatile AuthorId authorId = null;
@Override
public void onCreate(Bundle state) {
@@ -85,15 +75,7 @@ implements OnClickListener {
b = i.getByteArrayExtra("net.sf.briar.MESSAGE_ID");
if(b == null) throw new IllegalStateException();
messageId = new MessageId(b);
- String authorName = null;
- b = i.getByteArrayExtra("net.sf.briar.AUTHOR_ID");
- if(b != null) {
- authorId = new AuthorId(b);
- authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
- if(authorName == null) throw new IllegalStateException();
- String r = i.getStringExtra("net.sf.briar.RATING");
- if(r != null) rating = Rating.valueOf(r);
- }
+ String authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
String contentType = i.getStringExtra("net.sf.briar.CONTENT_TYPE");
if(contentType == null) throw new IllegalStateException();
long timestamp = i.getLongExtra("net.sf.briar.TIMESTAMP", -1);
@@ -124,19 +106,12 @@ implements OnClickListener {
header.setOrientation(HORIZONTAL);
header.setGravity(CENTER_VERTICAL);
- thumb = new ImageView(this);
- thumb.setPadding(5, 5, 5, 5);
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- header.addView(thumb);
-
TextView name = new TextView(this);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
if(authorName == null) {
name.setTextColor(res.getColor(R.color.anonymous_author));
name.setText(R.string.anonymous);
@@ -170,23 +145,6 @@ implements OnClickListener {
footer.setOrientation(HORIZONTAL);
footer.setGravity(CENTER);
- goodButton = new ImageButton(this);
- goodButton.setBackgroundResource(0);
- goodButton.setImageResource(R.drawable.rating_good);
- if(authorName == null) goodButton.setEnabled(false);
- else goodButton.setOnClickListener(this);
- footer.addView(goodButton);
- footer.addView(new HorizontalSpace(this));
-
- badButton = new ImageButton(this);
- badButton.setBackgroundResource(0);
- badButton.setImageResource(R.drawable.rating_bad);
- badButton.setOnClickListener(this);
- if(authorName == null) badButton.setEnabled(false);
- else badButton.setOnClickListener(this);
- footer.addView(badButton);
- footer.addView(new HorizontalSpace(this));
-
readButton = new ImageButton(this);
readButton.setBackgroundResource(0);
if(read) readButton.setImageResource(R.drawable.content_unread);
@@ -296,13 +254,7 @@ implements OnClickListener {
}
public void onClick(View view) {
- if(view == goodButton) {
- if(rating == BAD) setRatingInDatabase(UNRATED);
- else if(rating == UNRATED) setRatingInDatabase(GOOD);
- } else if(view == badButton) {
- if(rating == GOOD) setRatingInDatabase(UNRATED);
- else if(rating == UNRATED) setRatingInDatabase(BAD);
- } else if(view == readButton) {
+ if(view == readButton) {
setReadInDatabase(!read);
} else if(view == prevButton) {
setResult(RESULT_PREV);
@@ -319,38 +271,4 @@ implements OnClickListener {
finish();
}
}
-
- private void setRatingInDatabase(final Rating r) {
- dbUiExecutor.execute(new Runnable() {
- public void run() {
- try {
- lifecycleManager.waitForDatabase();
- long now = System.currentTimeMillis();
- db.setRating(authorId, r);
- long duration = System.currentTimeMillis() - now;
- if(LOG.isLoggable(INFO))
- LOG.info("Setting rating took " + duration + " ms");
- setRatingInUi(r);
- } catch(DbException e) {
- if(LOG.isLoggable(WARNING))
- LOG.log(WARNING, e.toString(), e);
- } catch(InterruptedException e) {
- if(LOG.isLoggable(INFO))
- LOG.info("Interrupted while waiting for database");
- Thread.currentThread().interrupt();
- }
- }
- });
- }
-
- private void setRatingInUi(final Rating r) {
- runOnUiThread(new Runnable() {
- public void run() {
- rating = r;
- if(r == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(r == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- }
- });
- }
}
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
index 2f3ffeaeb71792b40e75ebaeab4e394f0f5dd513..5d023014faf2fe0943c91308a9ce4bc3bffc2427 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java
@@ -230,7 +230,6 @@ implements DatabaseListener, OnClickListener, OnItemClickListener {
i.putExtra("net.sf.briar.CONTACT_ID", contactId.getInt());
i.putExtra("net.sf.briar.CONTACT_NAME", contactName);
i.putExtra("net.sf.briar.AUTHOR_NAME", item.getAuthor().getName());
- i.putExtra("net.sf.briar.RATING", item.getRating().toString());
i.putExtra("net.sf.briar.MESSAGE_ID", item.getId().getBytes());
i.putExtra("net.sf.briar.CONTENT_TYPE", item.getContentType());
i.putExtra("net.sf.briar.TIMESTAMP", item.getTimestamp());
diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
index 17207065defff58c335474689ad82ee9312607f4..52be9afbf219280202063ad62a3d6450ca5dc7fe 100644
--- a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
+++ b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java
@@ -6,15 +6,12 @@ import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
import java.util.ArrayList;
import net.sf.briar.R;
import net.sf.briar.android.util.HorizontalSpace;
import net.sf.briar.api.db.PrivateMessageHeader;
-import net.sf.briar.api.messaging.Rating;
import android.content.Context;
import android.content.res.Resources;
import android.text.format.DateUtils;
@@ -49,24 +46,17 @@ class ConversationAdapter extends ArrayAdapter<PrivateMessageHeader> {
innerLayout.setLayoutParams(WRAP_WRAP_1);
innerLayout.setOrientation(VERTICAL);
+ // FIXME: Can this layout be removed?
LinearLayout authorLayout = new LinearLayout(ctx);
authorLayout.setOrientation(HORIZONTAL);
authorLayout.setGravity(CENTER_VERTICAL);
- ImageView thumb = new ImageView(ctx);
- thumb.setPadding(5, 5, 5, 5);
- Rating rating = item.getRating();
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- authorLayout.addView(thumb);
-
TextView name = new TextView(ctx);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
name.setText(item.getAuthor().getName());
authorLayout.addView(name);
innerLayout.addView(authorLayout);
diff --git a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
index c86cbc7267dc2ac2b2e0ca92fcf6f9872abb7b17..4aa8c5ffa9292780bf37f86c6f99d0662d134a97 100644
--- a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
+++ b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java
@@ -10,9 +10,6 @@ import static java.util.logging.Level.WARNING;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP;
import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1;
import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1;
-import static net.sf.briar.api.messaging.Rating.BAD;
-import static net.sf.briar.api.messaging.Rating.GOOD;
-import static net.sf.briar.api.messaging.Rating.UNRATED;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.Executor;
@@ -28,7 +25,6 @@ import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchMessageException;
import net.sf.briar.api.lifecycle.LifecycleManager;
import net.sf.briar.api.messaging.MessageId;
-import net.sf.briar.api.messaging.Rating;
import roboguice.activity.RoboActivity;
import android.content.Intent;
import android.content.res.Resources;
@@ -37,7 +33,6 @@ import android.text.format.DateUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
-import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -55,7 +50,6 @@ implements OnClickListener {
Logger.getLogger(ReadPrivateMessageActivity.class.getName());
private ContactId contactId = null;
- private Rating rating = UNRATED;
private boolean read;
private ImageButton readButton = null, prevButton = null, nextButton = null;
private ImageButton replyButton = null;
@@ -80,9 +74,6 @@ implements OnClickListener {
setTitle(contactName);
String authorName = i.getStringExtra("net.sf.briar.AUTHOR_NAME");
if(authorName == null) throw new IllegalStateException();
- String r = i.getStringExtra("net.sf.briar.RATING");
- if(r == null) throw new IllegalStateException();
- rating = Rating.valueOf(r);
byte[] b = i.getByteArrayExtra("net.sf.briar.MESSAGE_ID");
if(b == null) throw new IllegalStateException();
messageId = new MessageId(b);
@@ -116,19 +107,12 @@ implements OnClickListener {
header.setOrientation(HORIZONTAL);
header.setGravity(CENTER_VERTICAL);
- ImageView thumb = new ImageView(this);
- thumb.setPadding(5, 5, 5, 5);
- if(rating == GOOD) thumb.setImageResource(R.drawable.rating_good);
- else if(rating == BAD) thumb.setImageResource(R.drawable.rating_bad);
- else thumb.setImageResource(R.drawable.rating_unrated);
- header.addView(thumb);
-
TextView name = new TextView(this);
// Give me all the unused width
name.setLayoutParams(WRAP_WRAP_1);
name.setTextSize(18);
name.setMaxLines(1);
- name.setPadding(0, 10, 10, 10);
+ name.setPadding(10, 10, 10, 10);
name.setText(authorName);
header.addView(name);