diff --git a/app/build.gradle b/app/build.gradle index 09982fa9..2a59303c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 15 targetSdkVersion 28 - versionCode 40 - versionName "0.9.2" + versionCode 41 + versionName "0.9.3" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -98,7 +98,7 @@ play { } dependencies { - implementation "io.github.wulkanowy:api:0.9.2" + implementation "io.github.wulkanowy:api:0.9.3" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "androidx.core:core:1.0.2" @@ -119,9 +119,9 @@ dependencies { implementation "androidx.work:work-runtime:2.0.1" implementation "androidx.work:work-rxjava2:2.0.1" - implementation "androidx.room:room-runtime:2.1.0-rc01" - implementation "androidx.room:room-rxjava2:2.1.0-rc01" - kapt "androidx.room:room-compiler:2.1.0-rc01" + implementation "androidx.room:room-runtime:2.1.0" + implementation "androidx.room:room-rxjava2:2.1.0" + kapt "androidx.room:room-compiler:2.1.0" implementation "com.google.dagger:dagger-android-support:2.23.1" kapt "com.google.dagger:dagger-compiler:2.23.1" @@ -167,7 +167,7 @@ dependencies { androidTestImplementation "androidx.test:runner:1.2.0" androidTestImplementation "androidx.test.ext:junit:1.1.1" androidTestImplementation "io.mockk:mockk-android:1.9.2" - androidTestImplementation "androidx.room:room-testing:2.1.0-rc01" + androidTestImplementation "androidx.room:room-testing:2.1.0" androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version" androidTestImplementation "org.mockito:mockito-core:2.28.2" androidTestImplementation("org.mockito:mockito-android:2.28.2") { diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt index 2b6fa04f..540a91be 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt @@ -6,6 +6,7 @@ import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.AppInfo import io.github.wulkanowy.utils.FirebaseAnalyticsHelper import io.github.wulkanowy.utils.SchedulersProvider +import io.github.wulkanowy.utils.ifNullOrBlank import timber.log.Timber import javax.inject.Inject @@ -81,7 +82,7 @@ class LoginFormPresenter @Inject constructor( view?.notifyParentAccountLogged(it) }, { Timber.i("Login result: An exception occurred") - analytics.logEvent("registration_form", "success" to false, "students" to -1, "endpoint" to endpoint, "error" to it.localizedMessage.ifEmpty { "No message" }) + analytics.logEvent("registration_form", "success" to false, "students" to -1, "endpoint" to endpoint, "error" to it.message.ifNullOrBlank { "No message" }) loginErrorHandler.dispatch(it) })) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt index 0636e163..e02227cb 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt @@ -7,6 +7,7 @@ import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper import io.github.wulkanowy.utils.SchedulersProvider +import io.github.wulkanowy.utils.ifNullOrBlank import timber.log.Timber import java.io.Serializable import javax.inject.Inject @@ -81,7 +82,7 @@ class LoginStudentSelectPresenter @Inject constructor( Timber.i("Registration result: Success") view?.openMainView() }, { error -> - students.forEach { analytics.logEvent("registration_student_select", "success" to false, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to error.localizedMessage.ifEmpty { "No message" }) } + students.forEach { analytics.logEvent("registration_student_select", "success" to false, "endpoint" to it.endpoint, "symbol" to it.symbol, "error" to error.message.ifNullOrBlank { "No message" }) } Timber.i("Registration result: An exception occurred ") loginErrorHandler.dispatch(error) view?.apply { diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt index 8776526e..5a7a3777 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt @@ -5,6 +5,7 @@ import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.modules.login.LoginErrorHandler import io.github.wulkanowy.utils.FirebaseAnalyticsHelper import io.github.wulkanowy.utils.SchedulersProvider +import io.github.wulkanowy.utils.ifNullOrBlank import io.reactivex.Single import timber.log.Timber import java.io.Serializable @@ -70,7 +71,7 @@ class LoginSymbolPresenter @Inject constructor( } }, { Timber.i("Login with symbol result: An exception occurred") - analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "endpoint" to loginData?.third, "symbol" to symbol, "error" to it.localizedMessage.ifEmpty { "No message" }) + analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "endpoint" to loginData?.third, "symbol" to symbol, "error" to it.message.ifNullOrBlank { "No message" }) loginErrorHandler.dispatch(it) })) } diff --git a/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt new file mode 100644 index 00000000..65167fd7 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/utils/StringExtension.kt @@ -0,0 +1,3 @@ +package io.github.wulkanowy.utils + +inline fun String?.ifNullOrBlank(defaultValue: () -> String) = if (this.isNullOrBlank()) defaultValue() else this diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt index 58574257..2bb64db6 100644 --- a/app/src/main/play/release-notes/pl-PL/default.txt +++ b/app/src/main/play/release-notes/pl-PL/default.txt @@ -1,9 +1,8 @@ -Wersja 0.9.2 +Wersja 0.9.3 Naprawiliśmy: -- ustawienia synchronizacji w tle -- ręczne odświeżanie ocen jeśli średnia była pobierana z dziennika -- wygląd ładowania w widoku Dostęp Mobilny -- sporadyczne awarie aplikacji na starszych urządzeniach +- problemy z logowaniem jeśli symbol zawierał cyfry +- bardzo rzadkie problemy z ładowaniem ocen +- jeszcze rzadsze problemy ze stabilnością podczas logowania Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases