display disabled telemetry packages, fix german localisation, use mai…

…nLooper
basti564 · Feb 8, 2022 · 1f2df2f · 1f2df2f
1 parent 2eeb15b
commit 1f2df2f
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 19 deletions.
diff --git a/app/src/main/java/com/bos/oculess/MainActivity.kt b/app/src/main/java/com/bos/oculess/MainActivity.kt
@@ -10,7 +10,9 @@ import android.content.pm.ApplicationInfo
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.os.Looper
 import android.provider.Settings
+import android.text.Html
 import android.view.WindowManager
 import android.widget.Button
 import android.widget.TextView
@@ -23,7 +25,7 @@ import android.os.Handler as Handler
 
 
 class MainActivity : AppCompatActivity() {
-    var audioApps: Array<String>? = null
+    private var audioApps: Array<String>? = null
 
     @SuppressLint("QueryPermissionsNeeded")
     @RequiresApi(Build.VERSION_CODES.P)
@@ -93,7 +95,7 @@ class MainActivity : AppCompatActivity() {
                 updateAudioPackages()
 
                 // Set recurring task (every 2s)
-                val handler = Handler()
+                val handler = Handler(Looper.getMainLooper())
                 val run = object : Runnable {
                     override fun run() {
                         handler.postDelayed(this, 2000)
@@ -106,7 +108,7 @@ class MainActivity : AppCompatActivity() {
 
             } else {
                 val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-                builder.setTitle(getString(R.string.title))
+                builder.setTitle(getString(R.string.title0))
                 builder.setMessage(getString(R.string.message2))
                 builder.setPositiveButton(
                     getString(R.string.ok)
@@ -122,7 +124,7 @@ class MainActivity : AppCompatActivity() {
 
         viewAdminsBtn.setOnClickListener {
             val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-            builder.setTitle(getString(R.string.title))
+            builder.setTitle(getString(R.string.title0))
             builder.setMessage(getString(R.string.message0))
             builder.setPositiveButton(
                 getString(R.string.ok)
@@ -167,7 +169,7 @@ class MainActivity : AppCompatActivity() {
 
         viewAccountsBtn.setOnClickListener {
             val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-            builder.setTitle(getString(R.string.title))
+            builder.setTitle(getString(R.string.title0))
             builder.setMessage(getString(R.string.message1))
             builder.setPositiveButton(
                 getString(R.string.ok)
@@ -203,7 +205,7 @@ class MainActivity : AppCompatActivity() {
                 }
             } else {
                 val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-                builder.setTitle(getString(R.string.title))
+                builder.setTitle(getString(R.string.title0))
                 builder.setMessage(getString(R.string.message2))
                 builder.setPositiveButton(
                     getString(R.string.ok)
@@ -229,6 +231,25 @@ class MainActivity : AppCompatActivity() {
                             deviceAdminReceiverComponentName, it, true
                         )
                     }
+
+                    val message = StringBuilder()
+                    telemetryApps.forEach {
+                        message.append("<b>")
+                            .append(it)
+                            .append("</b> is ")
+                            .append(if (dpm.isApplicationHidden(deviceAdminReceiverComponentName, it)) "disabled\r" else "<b>enabled</b>\r")
+                    }
+                    val builder1: AlertDialog.Builder = AlertDialog.Builder(this)
+                    builder1.setTitle(getString(R.string.title1))
+                    builder1.setMessage(Html.fromHtml(message.toString(), 0))
+                    builder1.setPositiveButton(
+                        getString(R.string.ok)
+                    ) { dialog, _ ->
+                        dialog.dismiss()
+                    }
+                    val alertDialog1: AlertDialog = builder1.create()
+                    alertDialog1.show()
+                    alertDialog1.window!!.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
                 }
                 builder.setNegativeButton(
                     getString(R.string.enable)
@@ -244,7 +265,7 @@ class MainActivity : AppCompatActivity() {
                 alertDialog.window!!.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
             } else {
                 val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-                builder.setTitle(getString(R.string.title))
+                builder.setTitle(getString(R.string.title0))
                 builder.setMessage(getString(R.string.message2))
                 builder.setPositiveButton(
                     getString(R.string.ok)
@@ -271,7 +292,7 @@ class MainActivity : AppCompatActivity() {
 
     fun updateAudioPackages() {
         /* Get All Installed Packages for Audio */
-        //getInstalledPackages longer works properly in android 11, but quest is on android 10 so it's fine
+        //getInstalledPackages no longer works properly in android 11, but the quest is on android 10 so it's fine
         val packageinfos = applicationContext.packageManager.getInstalledPackages(0)
         val packageNames = arrayListOf<String>()
         for (packageinfo in packageinfos) {

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Oculess</string>
-    <string name="app_subtitle">Modifikationstool für Oculus Quest-Geräte</string>
+    <string name="app_subtitle">Wekzeukkasten für Oculus Quest-Geräte</string>
 
     <string name="is_disabled">Oculus Begleit-Server ist deaktiviert!</string>
     <string name="is_enabled">Oculus Begleit-Server ist aktiviert!</string>
@@ -11,16 +11,17 @@
     <string name="remove_accounts">Updates Deaktivieren</string>
     <string name="disable_ota">Updates Deaktivieren</string>
     <string name="enable_ota">Updates Aktivieren</string>
-    <string name="telemetry">Aktivieren/Deaktivieren Telemetrie</string>
+    <string name="telemetry">Telemetrie Aktivieren/Deaktivieren</string>
 
-    <string name="title">Wichtige Information</string>
-    <string name="message0">Bitte starten Sie nach dem ersten Mal neu!\nWiederholen Sie den Schritt nach jedem Neustart!</string>
-    <string name="message1">Bitte entfernen Sie *alle* Accounts auf ihrem Gerät!\nWiederholen Sie den Schritt nach jedem Neustart!</string>
+    <string name="title0">Wichtige Information</string>
+    <string name="title1">Telemetrie Status</string>
+    <string name="message0">HINWEIS: Stellen stellen sie ihr System Design auf hell, sonst wird der Text nicht angezeigt\nBitte starten Sie nach dem ersten Mal neu!\nWiederholen Sie diesen Schritt nach jedem Neustart!</string>
+    <string name="message1">Bitte entfernen Sie *alle* Accounts auf ihrem Gerät!\nDies ist voruebergehent und wird nache einem Neustart zurueckgesetzt!</string>
     <string name="message2">Der Geräte Besitzer wurde nicht festgelegt!</string>
     <string name="message3">Wie möchten sie fortfahren?</string>
-    <string name="ok">Ok</string>
+    <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
     <string name="disable">Telemetrie Deaktivieren</string>
     <string name="enable">Telemetrie Aktivieren</string>
-    <string name="audio">Hintergrundaudio für alle Apps Aktivieren\n(bleibt nach Neustart nicht)</string>
+    <string name="audio">Hintergrundaudio für alle Apps Aktivieren\n(bis zum nästen Neustart)</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,15 +12,15 @@
     <string name="enable_ota">Enable Updates</string>
     <string name="telemetry">Enable/Disable Telemetry</string>
 
-    <string name="title">Important Info</string>
+    <string name="title0">Important Info</string>
+    <string name="title1">Telemetry Status</string>
     <string name="message0">NOTE: Set light theme, or else text will be white on white\nPlease restart after the first time!\nRepeat this step after every restart!</string>
-    <string name="message1">Please remove *all* the accounts on your Device!\nRepeat this step after every restart!</string>
+    <string name="message1">Please remove *all* the accounts on your Device!\nThis is temporary and does not persist a reboot!</string>
     <string name="message2">Device Owner has not been set!</string>
     <string name="message3">What would you like to do?</string>
-    <string name="ok">Ok</string>
+    <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="disable">Disable Telemetry</string>
     <string name="enable">Enable Telemetry</string>
     <string name="audio">Enable Background Audio for Installed Apps\n(Must reapply after reboot)</string>
-
 </resources>