Detect firefox.klar as well as firefox.focus

Author: mopsalarm

app/src/main/java/com/pr0gramm/app/util/BrowserHelper.kt

@@ -47,20 +47,22 @@ object BrowserHelper {
         }
     }
 
-    private val firefoxFocusSupported by memorize<Context, Boolean> { context ->
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"))
-        intent.`package` = "org.mozilla.focus"
-        return@memorize context.packageManager.queryIntentActivities(intent, 0).size > 0
+    private val firefoxFocusPackage by memorize<Context, String?> { context ->
+        return@memorize listOf("org.mozilla.klar", "org.mozilla.focus").firstOrNull {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"))
+            intent.`package` = "org.mozilla.focus"
+            context.packageManager.queryIntentActivities(intent, 0).size > 0
+        }
     }
 
     /**
      * Creates a builder with reasonable defaults to create a webview activity.
      */
     fun openIncognito(context: Context, url: String) {
         // if the firefox focus is installed, we'll open the page in this browser.
-        if (firefoxFocusSupported(context)) {
+        firefoxFocusPackage(context)?.let { packageName ->
             val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-            intent.`package` = "org.mozilla.focus"
+            intent.`package` = packageName
             context.startActivity(intent)
             return
         }