diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java index 99a4a3335afcef45a27a536231ce5658caca3c15..1c10a8b3608939bccbed4fb33687b5e2290ce93e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java @@ -67,15 +67,13 @@ public class ThreadItemAdapter<I extends ThreadItem> } void setItemWithIdVisible(MessageId messageId) { - if (messageId != null) { - int pos = 0; - for (I item : items) { - if (item.getId().equals(messageId)) { - layoutManager.scrollToPosition(pos); - break; - } - pos++; + int pos = 0; + for (I item : items) { + if (item.getId().equals(messageId)) { + layoutManager.scrollToPosition(pos); + break; } + pos++; } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index b62f35c772dce2206c6c91f04de8bbae7614e20b..fba82cc144d6a71eded33b37966306235f976818 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -154,7 +154,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI int position = layoutManager.findFirstVisibleItemPosition(); I i = adapter.getItemAt(position); - return i == null ? null : adapter.getItemAt(position).getId(); + return i == null ? null : i.getId(); } return null; } diff --git a/briar-core/src/test/java/org/briarproject/briar/client/MessageTrackerTest.java b/briar-core/src/test/java/org/briarproject/briar/client/MessageTrackerTest.java index 6f841703fe67468ff4fe8c8847ee2f2bb7a1d330..a7e8603202c358a92e625380282fbba3e35d619e 100644 --- a/briar-core/src/test/java/org/briarproject/briar/client/MessageTrackerTest.java +++ b/briar-core/src/test/java/org/briarproject/briar/client/MessageTrackerTest.java @@ -6,20 +6,17 @@ import org.briarproject.bramble.api.data.BdfEntry; import org.briarproject.bramble.api.db.DatabaseComponent; import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.MessageId; +import org.briarproject.bramble.test.BrambleMockTestCase; import org.briarproject.bramble.test.TestUtils; import org.briarproject.briar.api.client.MessageTracker; -import org.briarproject.briar.test.BriarTestCase; import org.jmock.Expectations; -import org.jmock.Mockery; -import org.junit.After; import org.junit.Assert; import org.junit.Test; import static org.briarproject.briar.client.MessageTrackerConstants.GROUP_KEY_STORED_MESSAGE_ID; -public class MessageTrackerTest extends BriarTestCase { +public class MessageTrackerTest extends BrambleMockTestCase { - protected final Mockery context = new Mockery(); protected final GroupId groupId = new GroupId(TestUtils.getRandomId()); protected final ClientHelper clientHelper = context.mock(ClientHelper.class); @@ -50,8 +47,4 @@ public class MessageTrackerTest extends BriarTestCase { Assert.assertTrue(messageId.equals(loadedId)); } - @After - public void checkExpectations() { - context.assertIsSatisfied(); - } }