diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcda6b91..0c0811b9 100644
--- 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
index 5f7c8c64..e21c2da3 100644
--- 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
index 02b390bf..d15b3e70 100755
Binary files a/app/src/main/assets/bin/arm/busybox and b/app/src/main/assets/bin/arm/busybox differ
diff --git a/app/src/main/assets/bin/arm/ssl_helper b/app/src/main/assets/bin/arm/ssl_helper
index f154f708..a19deccf 100755
Binary files a/app/src/main/assets/bin/arm/ssl_helper and b/app/src/main/assets/bin/arm/ssl_helper differ
diff --git a/app/src/main/assets/bin/arm_64/busybox b/app/src/main/assets/bin/arm_64/busybox
index 6027bc5c..974853f0 100755
Binary files a/app/src/main/assets/bin/arm_64/busybox and b/app/src/main/assets/bin/arm_64/busybox differ
diff --git a/app/src/main/assets/bin/arm_64/ssl_helper b/app/src/main/assets/bin/arm_64/ssl_helper
new file mode 100755
index 00000000..c1c087a0
Binary files /dev/null and b/app/src/main/assets/bin/arm_64/ssl_helper differ
diff --git a/app/src/main/assets/bin/x86/busybox b/app/src/main/assets/bin/x86/busybox
index 6ae06a1e..ab8fcd1e 100755
Binary files a/app/src/main/assets/bin/x86/busybox and b/app/src/main/assets/bin/x86/busybox differ
diff --git a/app/src/main/assets/bin/x86/ssl_helper b/app/src/main/assets/bin/x86/ssl_helper
index df683486..313b0a36 100755
Binary files a/app/src/main/assets/bin/x86/ssl_helper and b/app/src/main/assets/bin/x86/ssl_helper differ
diff --git a/app/src/main/assets/bin/x86_64/busybox b/app/src/main/assets/bin/x86_64/busybox
index d950d806..0eec7b69 100755
Binary files a/app/src/main/assets/bin/x86_64/busybox and b/app/src/main/assets/bin/x86_64/busybox differ
diff --git a/app/src/main/assets/bin/x86_64/ssl_helper b/app/src/main/assets/bin/x86_64/ssl_helper
new file mode 100755
index 00000000..d84aef20
Binary files /dev/null and b/app/src/main/assets/bin/x86_64/ssl_helper differ
diff --git a/app/src/main/assets/env b/app/src/main/assets/env
index f4c62606..a1039cb5 160000
--- a/app/src/main/assets/env
+++ b/app/src/main/assets/env
@@ -1 +1 @@
-Subproject commit f4c62606ac8387a1ea76f8a9ffb0ed56f5cf2807
+Subproject commit a1039cb5e1732e0b8d7c602636a14bbd31a1ae7c
diff --git a/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java b/app/src/main/java/ru/meefik/linuxdeploy/EnvUtils.java
index c9448427..f9349901 100644
--- 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
index ed65a843..b0f143c2 100644
--- 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
index 6cd42238..119b76dc 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -329,7 +329,7 @@
- - 28
+ - 30
- armhfp
diff --git a/app/src/main/res/values/preferences.xml b/app/src/main/res/values/preferences.xml
index da9627ca..4e349c79 100644
--- a/app/src/main/res/values/preferences.xml
+++ b/app/src/main/res/values/preferences.xml
@@ -131,18 +131,18 @@
amd64
- 28
+ 30
- http://dl.fedoraproject.org/pub/archive/
+ http://dl.fedoraproject.org/pub/
armhfp
- http://dl.fedoraproject.org/pub/archive/
+ http://dl.fedoraproject.org/pub/
aarch64
- http://dl.fedoraproject.org/pub/archive/
+ http://dl.fedoraproject.org/pub/
i386
- http://dl.fedoraproject.org/pub/archive/
+ http://dl.fedoraproject.org/pub/
x86_64