Improve handling my link when not logged in (home-assistant#3826)

anyuta1166 · Aug 28, 2023 · 201931b · 201931b
1 parent c11f2da
commit 201931b
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/app/src/main/java/io/homeassistant/companion/android/launch/my/MyActivity.kt b/app/src/main/java/io/homeassistant/companion/android/launch/my/MyActivity.kt
@@ -37,11 +37,21 @@ class MyActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        if (!serverManager.isRegistered()) {
+            finish()
+            return
+        }
+
         val binding = ActivityMyBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        if (Intent.ACTION_VIEW == intent?.action && intent.data != null) {
-            if (intent.data?.getQueryParameter("mobile")?.equals("1") == true) {
+        if (intent?.action == Intent.ACTION_VIEW && intent.data != null) {
+            if (
+                intent.data?.scheme != "https" ||
+                intent.data?.host != "my.home-assistant.io" ||
+                intent.data?.path?.startsWith("/redirect/") != true ||
+                intent.data?.getQueryParameter("mobile")?.equals("1") == true
+            ) {
                 finish()
                 return
             }