Merge branch 'release/1.1.8'

PnX-SI · May 2, 2021 · fd8aab7 · fd8aab7
2 parents b7de1bf + e43eb29
commit fd8aab7
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 93 deletions.
diff --git a/sync/build.gradle b/sync/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: "kotlin-kapt"
 
-version = "1.1.7"
+version = "1.1.8"
 
 android {
     compileSdkVersion 29

diff --git a/sync/src/main/java/fr/geonature/sync/sync/PackageInfoManager.kt b/sync/src/main/java/fr/geonature/sync/sync/PackageInfoManager.kt
@@ -3,6 +3,7 @@ package fr.geonature.sync.sync
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.PackageManager
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import fr.geonature.commons.util.getInputsFolder
@@ -33,8 +34,7 @@ class PackageInfoManager private constructor(private val applicationContext: Con
     private val sharedUserId = pm.getPackageInfo(
         applicationContext.packageName,
         PackageManager.GET_META_DATA
-    )
-        .sharedUserId
+    ).sharedUserId
 
     private val availablePackageInfos = mutableMapOf<String, PackageInfo>()
     private val packageInfos: MutableLiveData<List<PackageInfo>> = MutableLiveData()
@@ -45,89 +45,97 @@ class PackageInfoManager private constructor(private val applicationContext: Con
      * Finds all available applications from GeoNature.
      */
     @SuppressLint("DefaultLocale")
-    suspend fun getAvailableApplications(): List<PackageInfo> = withContext(IO) {
-        availablePackageInfos.clear()
-
-        val availableAppPackages = try {
-            val geoNatureAPIClient = GeoNatureAPIClient.instance(applicationContext)
-            val response = geoNatureAPIClient?.getApplications()
-                ?.awaitResponse()
-
-            if (response?.isSuccessful == true) {
-                response.body() ?: emptyList()
-            } else {
+    suspend fun getAvailableApplications(): List<PackageInfo> =
+        withContext(IO) {
+            availablePackageInfos.clear()
+
+            val availableAppPackages = try {
+                val geoNatureAPIClient = GeoNatureAPIClient.instance(applicationContext)
+                val response = geoNatureAPIClient
+                    ?.getApplications()
+                    ?.awaitResponse()
+
+                if (response?.isSuccessful == true) {
+                    response.body()
+                        ?: emptyList()
+                } else {
+                    emptyList()
+                }
+            } catch (e: Exception) {
                 emptyList()
             }
-        } catch (e: Exception) {
-            emptyList()
-        }
 
-        availableAppPackages.asSequence()
-            .map {
-                PackageInfo(
-                    it.packageName,
-                    it.code.toLowerCase()
-                        .capitalize(),
-                    it.versionCode.toLong(),
-                    0,
-                    null,
-                    it.apkUrl
-                ).apply {
-                    settings = it.settings
+            availableAppPackages
+                .asSequence()
+                .map {
+                    PackageInfo(
+                        it.packageName,
+                        it.code
+                            .toLowerCase()
+                            .capitalize(),
+                        it.versionCode.toLong(),
+                        0,
+                        null,
+                        it.apkUrl
+                    ).apply {
+                        settings = it.settings
+                    }
                 }
-            }
-            .onEach {
-                availablePackageInfos[it.packageName] = it
-            }
-            .toList()
-            .also {
-                getInstalledApplications()
-            }
-    }
+                .onEach {
+                    availablePackageInfos[it.packageName] = it
+                }
+                .toList()
+                .also {
+                    getInstalledApplications()
+                }
+        }
 
     /**
      * Finds all compatible installed applications.
      */
-    suspend fun getInstalledApplications(): List<PackageInfo> = withContext(IO) {
-        val allPackageInfos = mutableMapOf<String, PackageInfo>()
-        allPackageInfos.putAll(availablePackageInfos)
-
-        pm.getInstalledApplications(PackageManager.GET_META_DATA)
-            .asFlow()
-            .filter { it.packageName.startsWith(sharedUserId) }
-            .map {
-                val packageInfoFromPackageManager = pm.getPackageInfo(
-                    it.packageName,
-                    PackageManager.GET_META_DATA
-                )
+    suspend fun getInstalledApplications(): List<PackageInfo> =
+        withContext(IO) {
+            val allPackageInfos = mutableMapOf<String, PackageInfo>()
+            allPackageInfos.putAll(availablePackageInfos)
+
+            pm
+                .getInstalledApplications(PackageManager.GET_META_DATA)
+                .asFlow()
+                .filter { it.packageName.startsWith(sharedUserId) }
+                .map {
+                    val packageInfoFromPackageManager = pm.getPackageInfo(
+                        it.packageName,
+                        PackageManager.GET_META_DATA
+                    )
 
-                val existingPackageInfo = availablePackageInfos[it.packageName]
-
-                @Suppress("DEPRECATION")
-                PackageInfo(
-                    it.packageName,
-                    pm.getApplicationLabel(it)
-                        .toString(),
-                    existingPackageInfo?.versionCode ?: 0,
-                    if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) packageInfoFromPackageManager.longVersionCode
-                    else packageInfoFromPackageManager.versionCode.toLong(),
-                    packageInfoFromPackageManager.versionName,
-                    existingPackageInfo?.apkUrl,
-                    pm.getApplicationIcon(it.packageName),
-                    pm.getLaunchIntentForPackage(it.packageName)
-                ).apply {
-                    inputs = getInputsToSynchronize(this).size
-                    settings = existingPackageInfo?.settings
+                    val existingPackageInfo = availablePackageInfos[it.packageName]
+
+                    @Suppress("DEPRECATION") PackageInfo(
+                        it.packageName,
+                        pm
+                            .getApplicationLabel(it)
+                            .toString(),
+                        existingPackageInfo?.versionCode
+                            ?: 0,
+                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) packageInfoFromPackageManager.longVersionCode
+                        else packageInfoFromPackageManager.versionCode.toLong(),
+                        packageInfoFromPackageManager.versionName,
+                        existingPackageInfo?.apkUrl,
+                        pm.getApplicationIcon(it.packageName),
+                        pm.getLaunchIntentForPackage(it.packageName)
+                    ).apply {
+                        inputs = getInputsToSynchronize(this).size
+                        settings = existingPackageInfo?.settings
+                    }
                 }
-            }
-            .onEach {
-                allPackageInfos[it.packageName] = it
-            }
-            .toList()
-            .also {
-                packageInfos.postValue(allPackageInfos.values.toList())
-            }
-    }
+                .onEach {
+                    allPackageInfos[it.packageName] = it
+                }
+                .toList()
+                .also {
+                    packageInfos.postValue(allPackageInfos.values.toList())
+                }
+        }
 
     /**
      * Gets related info from package name.
@@ -141,10 +149,11 @@ class PackageInfoManager private constructor(private val applicationContext: Con
      */
     suspend fun getInputsToSynchronize(packageInfo: PackageInfo): List<SyncInput> =
         withContext(IO) {
-            FileUtils.getInputsFolder(
-                applicationContext,
-                packageInfo.packageName
-            )
+            FileUtils
+                .getInputsFolder(
+                    applicationContext,
+                    packageInfo.packageName
+                )
                 .walkTopDown()
                 .filter { f -> f.isFile && f.extension == "json" && f.canRead() }
                 .map {
@@ -160,11 +169,20 @@ class PackageInfoManager private constructor(private val applicationContext: Con
                 .toList()
         }
 
-    suspend fun updateAppSettings(packageInfo: PackageInfo) = withContext(IO) {
-        AppSettingsJsonWriter(applicationContext).write(packageInfo)
-    }
+    suspend fun updateAppSettings(packageInfo: PackageInfo) =
+        withContext(IO) {
+            val result = runCatching { AppSettingsJsonWriter(applicationContext).write(packageInfo) }
+
+            if (result.isFailure) {
+                Log.w(
+                    TAG,
+                    "failed to update settings for '${packageInfo.packageName}'"
+                )
+            }
+        }
 
     companion object {
+        private val TAG = PackageInfoManager::class.java.name
 
         @Volatile
         private var INSTANCE: PackageInfoManager? = null
@@ -176,9 +194,11 @@ class PackageInfoManager private constructor(private val applicationContext: Con
          *
          * @return The singleton instance of [PackageInfoManager].
          */
-        fun getInstance(applicationContext: Context): PackageInfoManager = INSTANCE
-            ?: synchronized(this) {
-                INSTANCE ?: PackageInfoManager(applicationContext).also { INSTANCE = it }
-            }
+        fun getInstance(applicationContext: Context): PackageInfoManager =
+            INSTANCE
+                ?: synchronized(this) {
+                    INSTANCE
+                        ?: PackageInfoManager(applicationContext).also { INSTANCE = it }
+                }
     }
 }
diff --git a/sync/src/main/java/fr/geonature/sync/sync/io/AppSettingsJsonWriter.kt b/sync/src/main/java/fr/geonature/sync/sync/io/AppSettingsJsonWriter.kt
@@ -9,6 +9,7 @@ import fr.geonature.mountpoint.util.FileUtils.getRootFolder
 import fr.geonature.sync.api.model.AppPackage
 import fr.geonature.sync.sync.PackageInfo
 import java.io.FileWriter
+import java.io.IOException
 
 /**
  * Default `JsonWriter` about writing app settings as `JSON` from given [AppPackage].
@@ -17,6 +18,7 @@ import java.io.FileWriter
  */
 class AppSettingsJsonWriter(private val context: Context) {
 
+    @Throws(IOException::class)
     fun write(packageInfo: PackageInfo) {
         if (packageInfo.settings == null) {
             Log.w(
@@ -39,7 +41,8 @@ class AppSettingsJsonWriter(private val context: Context) {
         )
         val writer = FileWriter(appSettingsFile)
 
-        GsonBuilder().setPrettyPrinting()
+        GsonBuilder()
+            .setPrettyPrinting()
             .create()
             .toJson(
                 packageInfo.settings,

diff --git a/sync/src/main/java/fr/geonature/sync/ui/login/LoginActivity.kt b/sync/src/main/java/fr/geonature/sync/ui/login/LoginActivity.kt
@@ -1,6 +1,5 @@
 package fr.geonature.sync.ui.login
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -80,7 +79,7 @@ class LoginActivity : AppCompatActivity() {
                         showToast(R.string.login_success)
 
                         // Complete and destroy login activity once successful
-                        setResult(Activity.RESULT_OK)
+                        setResult(RESULT_OK)
                         finish()
                     }
                 )
@@ -176,7 +175,7 @@ class LoginActivity : AppCompatActivity() {
                                             event
                                         )
 
-                                        setResult(Activity.RESULT_CANCELED)
+                                        setResult(RESULT_CANCELED)
                                         finish()
                                     }
                                 }

diff --git a/sync/src/main/java/fr/geonature/sync/ui/settings/PreferencesActivity.kt b/sync/src/main/java/fr/geonature/sync/ui/settings/PreferencesActivity.kt
@@ -5,6 +5,8 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import fr.geonature.sync.util.SettingsUtils.getGeoNatureServerUrl
+import fr.geonature.sync.util.SettingsUtils.getTaxHubServerUrl
 
 /**
  * Global settings.
@@ -15,9 +17,15 @@ import androidx.appcompat.app.AppCompatActivity
  */
 class PreferencesActivity : AppCompatActivity() {
 
+    private var geonatureServerUrl: String? = null
+    private var taxhubServerUrl: String? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        geonatureServerUrl = getGeoNatureServerUrl(this)
+        taxhubServerUrl = getTaxHubServerUrl(this)
+
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         // Display the fragment as the main content.
@@ -30,6 +38,15 @@ class PreferencesActivity : AppCompatActivity() {
             .commit()
     }
 
+    override fun finish() {
+        setResult(
+            if (geonatureServerUrl != getGeoNatureServerUrl(this) || taxhubServerUrl != getTaxHubServerUrl(this)) RESULT_OK
+            else RESULT_CANCELED
+        )
+
+        super.finish()
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {

diff --git a/sync/version.properties b/sync/version.properties
@@ -1,2 +1,2 @@
-#Wed Apr 14 21:15:36 CEST 2021
-VERSION_CODE=2865
+#Sun May 02 14:35:10 CEST 2021
+VERSION_CODE=2870