upgrade room library to 1 (fix merge problem)

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', {

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);
         }