Release 2.5.1

meefik · Dec 29, 2019 · 1ffc890 · 1ffc890
2 parents 023118f + 2fcf650
commit 1ffc890
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.5.1] - 2019-11-04
+### Fixed
+- Fixed Arch Linux package management
+
+### Changed
+- Changed a format for privileged users to UID:GID
+
 ## [2.5.0] - 2019-11-04
 ### Added
 - Added compatibility with Android 10
-- Added support for Docker containers
+- Added support for Docker images
 
 ### Fixed
 - Fixed URL of Ubuntu repository

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,14 +6,15 @@ android {
 
     defaultConfig {
         applicationId 'ru.meefik.linuxdeploy'
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 29
         versionCode 256
         versionName "2.5.1"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

diff --git a/app/src/main/assets/bin/arm/busybox b/app/src/main/assets/bin/arm/busybox
diff --git a/app/src/main/assets/bin/arm/ssl_helper b/app/src/main/assets/bin/arm/ssl_helper
diff --git a/app/src/main/assets/bin/arm_64/busybox b/app/src/main/assets/bin/arm_64/busybox
diff --git a/app/src/main/assets/bin/arm_64/ssl_helper b/app/src/main/assets/bin/arm_64/ssl_helper
diff --git a/app/src/main/assets/bin/x86/busybox b/app/src/main/assets/bin/x86/busybox
diff --git a/app/src/main/assets/bin/x86/ssl_helper b/app/src/main/assets/bin/x86/ssl_helper
diff --git a/app/src/main/assets/bin/x86_64/busybox b/app/src/main/assets/bin/x86_64/busybox
diff --git a/app/src/main/assets/bin/x86_64/ssl_helper b/app/src/main/assets/bin/x86_64/ssl_helper
diff --git a/app/src/main/assets/env b/app/src/main/assets/env
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java b/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java
@@ -49,6 +49,7 @@ private static boolean extractFile(Context c, String target, String rootAsset, S
         AssetManager assetManager = c.getAssets();
         InputStream in = null;
         OutputStream out = null;
+        boolean result = true;
         try {
             in = assetManager.open(rootAsset + path);
             File fname = new File(target + path);
@@ -62,12 +63,12 @@ private static boolean extractFile(Context c, String target, String rootAsset, S
             out.flush();
         } catch (IOException e) {
             e.printStackTrace();
-            return false;
+            result = false;
         } finally {
             close(in);
             close(out);
         }
-        return true;
+        return result;
     }
 
     /**
@@ -150,6 +151,7 @@ private static boolean isRooted() {
         boolean result = false;
         OutputStream stdin = null;
         InputStream stdout = null;
+        int n = 0;
         try {
             Process process = Runtime.getRuntime().exec("su");
             stdin = process.getOutputStream();
@@ -167,7 +169,6 @@ private static boolean isRooted() {
                 close(os);
             }
 
-            int n = 0;
             BufferedReader reader = null;
             try {
                 reader = new BufferedReader(new InputStreamReader(stdout));
@@ -179,17 +180,13 @@ private static boolean isRooted() {
             } finally {
                 close(reader);
             }
-
-            if (n > 0) {
-                result = true;
-            }
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
             close(stdout);
             close(stdin);
         }
-        return result;
+        return n > 0;
     }
 
     /**

diff --git a/app/src/main/java/ru/meefik/linuxdeploy/MainActivity.java b/app/src/main/java/ru/meefik/linuxdeploy/MainActivity.java
@@ -204,7 +204,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onBackPressed() {
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
-        if (drawer.isDrawerOpen(GravityCompat.START)) {
+        if (drawer != null && drawer.isDrawerOpen(GravityCompat.START)) {
             drawer.closeDrawer(GravityCompat.START);
         } else {
             super.onBackPressed();

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -329,7 +329,7 @@
     <!-- Fedora -->
 
     <string-array name="fedora_suite_values" translatable="false">
-        <item>28</item>
+        <item>30</item>
     </string-array>
     <string-array name="fedora_arch_values" translatable="false">
         <item>armhfp</item> <!-- f19 and later -->

diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml
@@ -131,18 +131,18 @@
     <string name="x86_64_kali_arch" translatable="false">amd64</string>
 
     <!-- Fedora -->
-    <string name="fedora_suite" translatable="false">28</string>
+    <string name="fedora_suite" translatable="false">30</string>
     <!-- arm -->
-    <string name="arm_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
+    <string name="arm_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/</string>
     <string name="arm_fedora_arch" translatable="false">armhfp</string>
     <!-- arm_64 -->
-    <string name="arm_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
+    <string name="arm_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/</string>
     <string name="arm_64_fedora_arch" translatable="false">aarch64</string>
     <!-- x86 -->
-    <string name="x86_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
+    <string name="x86_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/</string>
     <string name="x86_fedora_arch" translatable="false">i386</string>
     <!-- x86_64 -->
-    <string name="x86_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/archive/</string>
+    <string name="x86_64_fedora_source_path" translatable="false">http://dl.fedoraproject.org/pub/</string>
     <string name="x86_64_fedora_arch" translatable="false">x86_64</string>
 
     <!-- CentOS -->