From 3053e097a7fb9411c8b98f8a60bf1173915f06a5 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Tue, 7 Nov 2017 13:12:57 +0100 Subject: [PATCH] upgrade room library to 1 (fix merge problem) --- app/build.gradle | 4 ++-- .../com/keylesspalace/tusky/fragment/TimelineFragment.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 729801e0..235bedd4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,8 +62,8 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.0.2' //room - compile "android.arch.persistence.room:runtime:1.0.0-rc1" - annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-rc1' + compile "android.arch.persistence.room:runtime:1.0.0" + annotationProcessor 'android.arch.persistence.room:compiler:1.0.0' testCompile "junit:junit:4.12" androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java index 0861a86a..7b0434ac 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java @@ -520,7 +520,7 @@ public class TimelineFragment extends SFragment implements case TAG: return api.hashtagTimeline(tagOrId, null, fromId, uptoId, LOAD_AT_ONCE); case USER: - return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE); + return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, false); case FAVOURITES: return api.favourites(fromId, uptoId, LOAD_AT_ONCE); }