sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix no current student in services after logout all accounts (#342)

Browse Source
This commit is contained in:
Rafał Borcz 2019-05-18 23:42:47 +02:00 committed by Mikołaj Pich
parent 667c4b6af7
commit 0977282a4b
7 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -11,10 +11,10 @@ cache:
- $HOME/.gradle/caches/ - $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/ - $HOME/.gradle/wrapper/
#branches: branches:
# only: only:
# - master - master
# - 0.8.x - 0.8.x
android: android:
licenses: licenses:

2
app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
View File

@ -22,6 +22,8 @@ class StudentRepository @Inject constructor(
fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it } fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> { fun getStudents(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
return ReactiveNetwork.checkInternetConnectivity(settings) return ReactiveNetwork.checkInternetConnectivity(settings)
.flatMap { .flatMap {

2
app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
View File

@ -35,7 +35,7 @@ class SyncWorker @AssistedInject constructor(
override fun createWork(): Single<Result> { override fun createWork(): Single<Result> {
Timber.i("SyncWorker is starting") Timber.i("SyncWorker is starting")
return studentRepository.isStudentSaved() return studentRepository.isCurrentStudentSet()
.filter { true } .filter { true }
.flatMap { studentRepository.getCurrentStudent().toMaybe() } .flatMap { studentRepository.getCurrentStudent().toMaybe() }
.flatMapCompletable { student -> .flatMapCompletable { student ->

5
app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
View File

@ -100,8 +100,9 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
when { when {
student != null -> Maybe.just(student) student != null -> Maybe.just(student)
studentId != 0L -> { studentId != 0L -> {
studentRepository.getCurrentStudent(false) studentRepository.isCurrentStudentSet()
.toMaybe() .filter { true }
.flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
.doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) } .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
} }
else -> Maybe.empty() else -> Maybe.empty()

2
app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
View File

@ -14,7 +14,7 @@ class SplashPresenter @Inject constructor(
override fun onAttachView(view: SplashView) { override fun onAttachView(view: SplashView) {
super.onAttachView(view) super.onAttachView(view)
disposable.add(studentRepository.isStudentSaved() disposable.add(studentRepository.isCurrentStudentSet()
.subscribeOn(schedulers.backgroundThread) .subscribeOn(schedulers.backgroundThread)
.observeOn(schedulers.mainThread) .observeOn(schedulers.mainThread)
.subscribe({ .subscribe({

5
app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
View File

@ -161,8 +161,9 @@ class TimetableWidgetProvider : BroadcastReceiver() {
when { when {
student != null -> Maybe.just(student) student != null -> Maybe.just(student)
studentId != 0L -> { studentId != 0L -> {
studentRepository.getCurrentStudent(false) studentRepository.isCurrentStudentSet()
.toMaybe() .filter { true }
.flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
.doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) } .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
} }
else -> Maybe.empty() else -> Maybe.empty()

4
app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
View File

@ -32,14 +32,14 @@ class SplashPresenterTest {
@Test @Test
fun testOpenLoginView() { fun testOpenLoginView() {
doReturn(Single.just(false)).`when`(studentRepository).isStudentSaved() doReturn(Single.just(false)).`when`(studentRepository).isCurrentStudentSet()
presenter.onAttachView(splashView) presenter.onAttachView(splashView)
verify(splashView).openLoginView() verify(splashView).openLoginView()
} }
@Test @Test
fun testMainMainView() { fun testMainMainView() {
doReturn(Single.just(true)).`when`(studentRepository).isStudentSaved() doReturn(Single.just(true)).`when`(studentRepository).isCurrentStudentSet()
presenter.onAttachView(splashView) presenter.onAttachView(splashView)
verify(splashView).openMainView() verify(splashView).openMainView()
} }