From c9dcd906c908f61f433d4ac5d7db09d639f961fe Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Sat, 6 May 2017 21:36:25 +0200
Subject: [PATCH] final pre-merge fixes
---
.../org/briarproject/briar/android/threaded/ThreadItemList.java | 2 +-
.../briarproject/briar/android/threaded/ThreadItemListImpl.java | 2 +-
.../briar/android/threaded/ThreadListControllerImpl.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemList.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemList.java
index d4f067c2f7..f517e8e9cc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemList.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemList.java
@@ -11,5 +11,5 @@ public interface ThreadItemList<I extends ThreadItem> extends List<I> {
@Nullable
MessageId getFirstVisibleItemId();
- void setBottomVisibleItemId(@Nullable MessageId bottomVisibleItemId);
+ void setFirstVisibleId(@Nullable MessageId bottomVisibleItemId);
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemListImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemListImpl.java
index f6fb80e682..2886607edc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemListImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemListImpl.java
@@ -16,7 +16,7 @@ public class ThreadItemListImpl<I extends ThreadItem> extends ArrayList<I>
return bottomVisibleItemId;
}
- public void setBottomVisibleItemId(@Nullable MessageId bottomVisibleItemId) {
+ public void setFirstVisibleId(@Nullable MessageId bottomVisibleItemId) {
this.bottomVisibleItemId = bottomVisibleItemId;
}
}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java
index add7a97766..0793d785ad 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java
@@ -317,7 +317,7 @@ public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends T
MessageId msgId = messageTracker.loadStoredMessageId(groupId);
if (LOG.isLoggable(INFO))
LOG.info("Loaded last top visible message id " + msgId);
- items.setBottomVisibleItemId(msgId);
+ items.setFirstVisibleId(msgId);
return items;
}
--
GitLab