Rewritten to Kotlin. Replaced Rx with Coroutines. Added tests

Author: Eduard Ablekimov

.idea/gradle.xml

@@ -44,6 +44,7 @@ dependencies {
 
     // Anko
     implementation "org.jetbrains.anko:anko-sdk15:$ankoVersion" // So here it's 15 too
+    implementation "org.jetbrains.anko:anko-sdk21-coroutines:$ankoVersion"
 
     // Anko libs matching support libs
     implementation "org.jetbrains.anko:anko-appcompat-v7:${ankoVersion}"

app/build.gradle

@@ -1,29 +1,33 @@
 package com.ackee.versionupdatehandler.setup
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.ackee.versionupdatehandler.R
+import com.ackee.versioupdatehandler.VersionFetcher
 import com.ackee.versioupdatehandler.VersionStatusResolver
 import com.ackee.versioupdatehandler.model.BasicVersionsConfiguration
 import com.ackee.versioupdatehandler.model.DialogSettings
 import com.ackee.versioupdatehandler.model.VersionStatus
-import io.reactivex.Single
+import com.ackee.versioupdatehandler.model.VersionsConfiguration
 import org.jetbrains.anko.*
+import org.jetbrains.anko.sdk21.coroutines.onClick
 import java.util.Random
 
 /**
  * Activity with samples
  */
 class MainActivity : AppCompatActivity() {
 
+    @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         scrollView {
             verticalLayout {
                 padding = dip(16)
                 button {
                     text = "Not mandatory update"
-                    setOnClickListener {
+                    onClick {
                         checkWithVersion(13)
                     }
                 }.lparams(width = matchParent) {
@@ -32,7 +36,7 @@ class MainActivity : AppCompatActivity() {
 
                 button {
                     text = "Mandatory update"
-                    setOnClickListener {
+                    onClick {
                         checkWithVersion(8)
                     }
                 }.lparams(width = matchParent) {
@@ -41,15 +45,13 @@ class MainActivity : AppCompatActivity() {
 
                 button {
                     text = "Customized dialog"
-                    setOnClickListener {
-                        VersionStatusResolver({
-                            Single.just(BasicVersionsConfiguration(10, 15))
-                        }).checkVersionStatusAndOpenDefault(8, supportFragmentManager, DialogSettings.Builder()
-                                .title("My custom title")
-                                .messageRes(R.string.update_dialog_message)
-                                .positiveButton("Yaay")
-                                .negativeButton("Never")
-                                .build()
+                    onClick {
+                        getDefaultStatusResolver().checkVersionStatusAndOpenDefault(8, supportFragmentManager, DialogSettings.Builder()
+                            .title("My custom title")
+                            .messageRes(R.string.update_dialog_message)
+                            .positiveButton("Yaay")
+                            .negativeButton("Never")
+                            .build()
                         )
                     }
                 }.lparams(width = matchParent) {
@@ -58,16 +60,12 @@ class MainActivity : AppCompatActivity() {
 
                 button {
                     text = "Custom UI"
-                    setOnClickListener {
-                        VersionStatusResolver({
-                            Single.just(BasicVersionsConfiguration(10, 15))
-                        }).checkVersionStatus(if (Random().nextInt() % 2 == 0) 8 else 12)
-                                .subscribe({
-                                    when (it) {
-                                        VersionStatus.UPDATE_AVAILABLE -> toast("Update is available")
-                                        VersionStatus.UPDATE_REQUIRED -> toast("Mandatory update is available")
-                                    }
-                                }, Throwable::printStackTrace)
+                    onClick {
+                        when (getDefaultStatusResolver().checkVersionStatus(if (Random().nextInt() % 2 == 0) 8 else 12)) {
+                            VersionStatus.UPDATE_AVAILABLE -> toast("Update is available")
+                            VersionStatus.UPDATE_REQUIRED -> toast("Mandatory update is available")
+                            VersionStatus.UP_TO_DATE -> toast("Up to date")
+                        }
                     }
                 }.lparams(width = matchParent) {
                     bottomMargin = dip(16)
@@ -76,10 +74,16 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun checkWithVersion(version: Int) {
+    private suspend fun checkWithVersion(version: Int) {
         // replace fetcher with some real one
-        VersionStatusResolver({
-            Single.just(BasicVersionsConfiguration(10, 15))
-        }).checkVersionStatusAndOpenDefault(version, supportFragmentManager)
+        getDefaultStatusResolver().checkVersionStatusAndOpenDefault(version, supportFragmentManager)
+    }
+
+    private fun getDefaultStatusResolver(minimalVersion: Int = 10, currentVersion: Int = 15): VersionStatusResolver {
+        return VersionStatusResolver(object : VersionFetcher {
+            override suspend fun fetch(): VersionsConfiguration {
+                return BasicVersionsConfiguration(10, 15)
+            }
+        })
     }
 }

app/src/main/java/com/ackee/versionupdatehandler/setup/MainActivity.kt

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.72'
 
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'

build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 29
@@ -17,10 +18,17 @@ android {
     }
 }
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
-    testImplementation 'junit:junit:4.12'
-    implementation 'com.google.firebase:firebase-config:19.0.3'
+    testImplementation 'junit:junit:4.13'
+    implementation 'com.google.firebase:firebase-config:19.1.4'
     implementation project(':status-resolver')
+    implementation "androidx.core:core-ktx:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.3'
 }
 
 ext {

firebase-fetcher/build.gradle

@@ -0,0 +1,42 @@
+package com.ackee.versionupdatehandler
+
+import com.ackee.versioupdatehandler.VersionFetcher
+import com.ackee.versioupdatehandler.model.BasicVersionsConfiguration
+import com.ackee.versioupdatehandler.model.VersionsConfiguration
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import kotlinx.coroutines.tasks.await
+
+/**
+ * Class that fetches version configuration from Firebase Remote.
+ */
+class FirebaseVersionFetcher constructor(
+    private val cacheExpiration: Int = 3600,
+    private val minimalAttributeName: String = MINIMAL_VERSION,
+    private val currentAttributeName: String = CURRENT_VERSION
+) : VersionFetcher {
+
+    override suspend fun fetch(): VersionsConfiguration {
+        val remoteConfig = FirebaseRemoteConfig.getInstance().apply {
+            setDefaultsAsync(DEFAULTS)
+        }
+        val isDevMode = FirebaseRemoteConfig.getInstance().info.configSettings.isDeveloperModeEnabled
+        remoteConfig.fetch((if (isDevMode) 0 else cacheExpiration).toLong()).await()
+        remoteConfig.activate().await()
+
+        val minimalVersion = remoteConfig.getLong(minimalAttributeName)
+        val currentVersion = remoteConfig.getLong(currentAttributeName)
+        return BasicVersionsConfiguration(minimalVersion, currentVersion)
+    }
+
+    companion object {
+        const val MINIMAL_VERSION = "minimal_version_android"
+        const val CURRENT_VERSION = "current_version_android"
+
+        val DEFAULTS: Map<String, Any> by lazy {
+            mapOf(
+                MINIMAL_VERSION to -1,
+                CURRENT_VERSION to -1
+            )
+        }
+    }
+}

firebase-fetcher/src/main/java/com/ackee/versionupdatehandler/FirebaseVersionFetcher.java

@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=1.1.0
+VERSION_NAME=1.2.0
 VERSION_CODE=1
 GROUP=cz.ackee.updatechecker
 BINTRAY_REPO=version-update-handler

firebase-fetcher/src/main/java/com/ackee/versionupdatehandler/FirebaseVersionFetcher.kt

@@ -1,6 +1,6 @@
-#Wed Oct 16 14:22:47 CEST 2019
+#Tue Jun 09 15:27:04 YEKT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

gradle.properties

@@ -3,24 +3,24 @@
 # Android Version Status Resolver and Fetcher
 
 ## Purpose of library
-Many applications have need to tell their users to update current application because they have outdated version. Google Play doesnt support any API for that so we need to use custom solution.  This library will compare current application version number to the versions that are stored in remote locations (Api request/Firebase Remote Config, ...) and show the dialog to the user with prompt to update their app.
+Many applications have need to tell their users to update current application because they have outdated version. Google Play doesn't support any API for that so we need to use custom solution.  This library will compare current application version number to the versions that are stored in remote locations (Api request/Firebase Remote Config, ...) and show the dialog to the user with prompt to update their app.
 
 
-This library is based on RxJava2
+This library is based on Kotlin Coroutines
 ## Usage
 The simplest way for use this library is
 ```kotlin
  val versionFetcher = ...
  val versionResolver = VersionStatusResolver(versionFetcher)
- versionResolver.checkVersionStatusAndShowDefault(BuildConfig.VERSION_CODE, getSupportFragmentManager())
+ versionResolver.checkVersionStatusAndOpenDefault(BuildConfig.VERSION_CODE, getSupportFragmentManager())
 ```
 
 this will check versions and show update dialog with default texts. If you want to modify strings in dialog and maybe package name, you can via DialogSettings.Builder() class.
 
 ```kotlin
  val versionFetcher = ...
  val versionResolver = VersionStatusResolver(versionFetcher)
- versionResolver.checkVersionStatusAndShowDefault(BuildConfig.VERSION_CODE, getSupportFragmentManager(),
+ versionResolver.checkVersionStatusAndOpenDefault(BuildConfig.VERSION_CODE, getSupportFragmentManager(),
                             DialogSettings.Builder()
                             .title("My custom title")
                             .messageRes(R.string.update_dialog_message)