Send additional analytics from FM

max-kammerer · Apr 21, 2024 · 31ecdf3 · 31ecdf3
1 parent 0b28f32
commit 31ecdf3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/...r/src/analytics/kotlin/universe/constellation/orion/viewer/analytics/FireBaseAnalytics.kt b/...r/src/analytics/kotlin/universe/constellation/orion/viewer/analytics/FireBaseAnalytics.kt
@@ -103,6 +103,13 @@ class FireBaseAnalytics : Analytics() {
         }
     }
 
+    override fun permissionEvent(screen: String, state: Boolean) {
+        logEvent("permissionResult") {
+            param("screen", screen)
+            param("state", state.toString())
+        }
+    }
+
     private inline fun logEvent(
         event: String,
         crossinline block: ParametersBuilder.() -> Unit = {}

diff --git a/orion-viewer/src/main/java/universe/constellation/orion/viewer/analytics/Analytics.kt b/orion-viewer/src/main/java/universe/constellation/orion/viewer/analytics/Analytics.kt
@@ -41,6 +41,10 @@ open class Analytics {
 
     }
 
+    open fun permissionEvent(screen: String, state: Boolean) {
+
+    }
+
     companion object {
 
         fun initialize(contentResolver: ContentResolver, analytics: Analytics): Analytics {

diff --git a/...src/main/java/universe/constellation/orion/viewer/filemanager/OrionFileManagerActivity.kt b/...src/main/java/universe/constellation/orion/viewer/filemanager/OrionFileManagerActivity.kt
@@ -222,16 +222,6 @@ abstract class OrionFileManagerActivityBase @JvmOverloads constructor(
         showPermissionRequestDialog()
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (Permissions.ASK_READ_PERMISSION_FOR_FILE_MANAGER == requestCode) {
-            log("Permission callback: " + permissions.joinToString() + " " + grantResults.joinToString())
-            if (checkPermissionGranted(grantResults, permissions, Manifest.permission.READ_EXTERNAL_STORAGE)) {
-                refreshFolder()
-            }
-        }
-    }
-
     private fun refreshFolder() {
         val list = findViewById<ListView>(R.id.listView)
         val adapter = list.adapter
@@ -242,14 +232,28 @@ abstract class OrionFileManagerActivityBase @JvmOverloads constructor(
         }
     }
 
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (Permissions.ASK_READ_PERMISSION_FOR_FILE_MANAGER == requestCode) {
+            log("Permission callback: " + permissions.joinToString() + " " + grantResults.joinToString())
+            actualizePermissions()
+        }
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         log("FileManager: On activity result requestCode=$requestCode resultCode=$resultCode")
         if (requestCode == Permissions.ASK_READ_PERMISSION_FOR_FILE_MANAGER) {
-            if (hasReadStoragePermission(this)) {
-                refreshFolder()
-            }
+            actualizePermissions()
+        }
+    }
+
+    private fun actualizePermissions() {
+        val hasReadStoragePermission = hasReadStoragePermission(this)
+        if (hasReadStoragePermission) {
+            refreshFolder()
         }
+        analytics.permissionEvent(this.javaClass.name, hasReadStoragePermission)
     }
 
     private fun showPermissionRequestDialog() {