upgrade room library to 1 (fix merge problem)
This commit is contained in:
parent
55f7c98450
commit
7cbdf2c96c
|
@ -62,8 +62,8 @@ dependencies {
|
||||||
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
|
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||||
|
|
||||||
//room
|
//room
|
||||||
compile "android.arch.persistence.room:runtime:1.0.0-rc1"
|
compile "android.arch.persistence.room:runtime:1.0.0"
|
||||||
annotationProcessor 'android.arch.persistence.room:compiler:1.0.0-rc1'
|
annotationProcessor 'android.arch.persistence.room:compiler:1.0.0'
|
||||||
|
|
||||||
testCompile "junit:junit:4.12"
|
testCompile "junit:junit:4.12"
|
||||||
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
|
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
|
||||||
|
|
|
@ -520,7 +520,7 @@ public class TimelineFragment extends SFragment implements
|
||||||
case TAG:
|
case TAG:
|
||||||
return api.hashtagTimeline(tagOrId, null, fromId, uptoId, LOAD_AT_ONCE);
|
return api.hashtagTimeline(tagOrId, null, fromId, uptoId, LOAD_AT_ONCE);
|
||||||
case USER:
|
case USER:
|
||||||
return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE);
|
return api.accountStatuses(tagOrId, fromId, uptoId, LOAD_AT_ONCE, false);
|
||||||
case FAVOURITES:
|
case FAVOURITES:
|
||||||
return api.favourites(fromId, uptoId, LOAD_AT_ONCE);
|
return api.favourites(fromId, uptoId, LOAD_AT_ONCE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue