Adjustments for Allnet Prime tablets

Signed-off-by: Manfred Mueller <mail@manfred-mueller.org>

Author: manfred-mueller

app/build.gradle

@@ -32,7 +32,7 @@ android {
         versionCode rootProject.ext.verCode
         versionName rootProject.ext.verName
 
-        setProperty("archivesBaseName", "w3kiosk-$versionName")
+        setProperty("archivesBaseName", "w3kiosk")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/nass/ek/w3kiosk/SettingsActivity.java

@@ -308,23 +308,26 @@ protected void onCreate(Bundle savedInstanceState) {
             }
 
             c = findViewById(R.id.writeStorage);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                // Android 11+ (API 30 and above, including Android 13)
-                if (Environment.isExternalStorageManager()) {
-                    // If MANAGE_EXTERNAL_STORAGE permission is granted, disable the checkbox
-                    c.setChecked(true);
-                    c.setEnabled(false);
+            if (android.os.Build.MODEL.toUpperCase().startsWith("PRIME")) {
+                c.setVisibility(View.GONE);
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    // Android 11+ (API 30 and above, including Android 13)
+                    if (Environment.isExternalStorageManager()) {
+                        // If MANAGE_EXTERNAL_STORAGE permission is granted, disable the checkbox
+                        c.setChecked(true);
+                        c.setEnabled(false);
+                    } else {
+                        // If not granted, enable checkbox to request permission
+                        c.setChecked(false);
+                        c.setEnabled(false);
+                    }
                 } else {
-                    // If not granted, enable checkbox to request permission
-                    c.setChecked(false);
-                    c.setEnabled(false);
+                    // Android 10 and below: Check WRITE_EXTERNAL_STORAGE permission
+                    boolean hasWritePermission = context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+                    c.setChecked(hasWritePermission);
+                    c.setEnabled(!hasWritePermission);
                 }
-            } else {
-                // Android 10 and below: Check WRITE_EXTERNAL_STORAGE permission
-                boolean hasWritePermission = context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-                c.setChecked(hasWritePermission);
-                c.setEnabled(!hasWritePermission);
             }
             String configFileContent = readConfigFileContents();
 
@@ -334,7 +337,7 @@ protected void onCreate(Bundle savedInstanceState) {
             }
 
             c = findViewById(R.id.camAccess);
-            if (ChecksAndConfigs.isTv()) {
+            if (ChecksAndConfigs.isTv() || android.os.Build.MODEL.toUpperCase().startsWith("PRIME")) {
                 c.setVisibility(View.GONE);
             } else {
                 c.setChecked(context.checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED);

build.gradle

@@ -17,7 +17,7 @@ configurations.configureEach {
 }
 
 ext {
-    verCode = 54
+    verCode = 55
     verName = "2.6.3"
     releaseDir = file("${projectDir}/app/release")
 }

w3kiosk.json

@@ -1,5 +1,5 @@
 {
-    "versionCode":54,
+    "versionCode":55,
     "versionName":"2.6.3",
     "contentText":"Neue W3Kiosk-Version",
     "minSupport":1,