Fix importing files on TVs

amnezia-vpn · Oct 31, 2024 · 81ef931 · 81ef931
1 parent 346de2b
commit 81ef931
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/client/android/res/values-ru/strings.xml b/client/android/res/values-ru/strings.xml
@@ -23,4 +23,6 @@
     <string name="notificationSettingsDialogTitle">Настройки уведомлений</string>
     <string name="notificationSettingsDialogMessage">Для показа уведомлений необходимо включить уведомления в системных настройках</string>
     <string name="openNotificationSettings">Открыть настройки уведомлений</string>
+
+    <string name="tvNoFileBrowser">Пожалуйста, установите приложение для просмотра файлов</string>
 </resources>
diff --git a/client/android/res/values/strings.xml b/client/android/res/values/strings.xml
@@ -23,4 +23,6 @@
     <string name="notificationSettingsDialogTitle">Notification settings</string>
     <string name="notificationSettingsDialogMessage">To show notifications, you must enable notifications in the system settings</string>
     <string name="openNotificationSettings">Open notification settings</string>
+
+    <string name="tvNoFileBrowser">Please install a file management utility to browse files</string>
 </resources>
diff --git a/client/android/src/org/amnezia/vpn/AmneziaActivity.kt b/client/android/src/org/amnezia/vpn/AmneziaActivity.kt
@@ -4,6 +4,7 @@ import android.Manifest
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.app.NotificationManager
+import android.content.ActivityNotFoundException
 import android.content.BroadcastReceiver
 import android.content.ComponentName
 import android.content.Intent
@@ -563,16 +564,20 @@ class AmneziaActivity : QtActivity() {
                     }
                 }
             }.also {
-                startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
-                    onAny = {
-                        val uri = it?.data?.toString() ?: ""
-                        Log.v(TAG, "Open file: $uri")
-                        mainScope.launch {
-                            qtInitialized.await()
-                            QtAndroidController.onFileOpened(uri)
+                try {
+                    startActivityForResult(it, OPEN_FILE_ACTION_CODE, ActivityResultHandler(
+                        onAny = {
+                            val uri = it?.data?.toString() ?: ""
+                            Log.v(TAG, "Open file: $uri")
+                            mainScope.launch {
+                                qtInitialized.await()
+                                QtAndroidController.onFileOpened(uri)
+                            }
                         }
-                    }
-                ))
+                    ))
+                } catch (_: ActivityNotFoundException) {
+                    Toast.makeText(this@AmneziaActivity, resources.getText(R.string.tvNoFileBrowser), Toast.LENGTH_LONG).show()
+                }
             }
         }
     }

diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp
@@ -165,7 +165,9 @@ QString AndroidController::openFile(const QString &filter)
             [&fileName, &wait](const QString &uri) {
                 qDebug() << "Android event: file opened; uri:" << uri;
                 fileName = QQmlFile::urlToLocalFileOrQrc(uri);
-                qDebug() << "Android opened filename:" << fileName;
+                qDebug() << "Qt url to local file:" << fileName;
+                // if qt failed, try using just uri
+                if (fileName.isEmpty()) fileName = uri;
                 wait.quit();
             },
             static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::SingleShotConnection));