Fix crash when no apps in enterprise policy

e-foundation · Oct 19, 2024 · 655cc6f · 655cc6f
1 parent f14124c
commit 655cc6f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/vending-app/src/main/java/org/microg/vending/ui/VendingActivity.kt b/vending-app/src/main/java/org/microg/vending/ui/VendingActivity.kt
@@ -207,6 +207,13 @@ class VendingActivity : ComponentActivity() {
 
                     Log.v(TAG, "app policy: ${apps.joinToString { "${it.packageName}: ${it.policy}" }}")
 
+                    if (apps.isEmpty()) {
+                        // Don't fetch details of empty app list (otherwise HTTP 400)
+                        networkState = NetworkState.PASSIVE
+                        this@VendingActivity.apps.clear()
+                        return@runBlocking
+                    }
+
                     // Fetch details about all available apps
                     val details = client.post(
                         url = URL_ITEM_DETAILS,
@@ -257,7 +264,7 @@ class VendingActivity : ComponentActivity() {
                     networkState = NetworkState.ERROR
                     Log.e(TAG, "Network error: ${e.message}")
                     e.printStackTrace()
-                } catch (e: NullPointerException) {
+                } catch (e: Exception) {
                     networkState = NetworkState.ERROR
                     Log.e(TAG, "Unexpected network response, cannot process")
                     e.printStackTrace()