diff --git a/build.gradle b/build.gradle
index 2ea01d2..67fd016 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,9 @@ buildscript {
ext.kotlin_version = '1.8.10'
ext.android = [
KOTLIN_VERSION : '1.8.10',
- MIN_SDK_VERSION : 21,
+ MIN_SDK_VERSION : 28,
COMPILE_SDK_VERSION: 34,
- TARGET_SDK_VERSION : 30,
+ TARGET_SDK_VERSION : 28,
JUNIT_VERSION : "4.12"
]
diff --git a/terminal/src/main/AndroidManifest.xml b/terminal/src/main/AndroidManifest.xml
index 7f05430..bb9b3fa 100644
--- a/terminal/src/main/AndroidManifest.xml
+++ b/terminal/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
android:usesCleartextTraffic="true"
android:resizeableActivity="true"
android:hardwareAccelerated="true"
+ android:hasFragileUserData="true"
android:largeHeap="true"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="false"
diff --git a/terminal/src/main/ic_launcher-playstore.png b/terminal/src/main/ic_launcher-playstore.png
index b3f2a18..995df4a 100644
Binary files a/terminal/src/main/ic_launcher-playstore.png and b/terminal/src/main/ic_launcher-playstore.png differ
diff --git a/terminal/src/main/java/com/evolinx/terminal/component/config/defaults.kt b/terminal/src/main/java/com/evolinx/terminal/component/config/defaults.kt
index 29f2ac2..8224e05 100644
--- a/terminal/src/main/java/com/evolinx/terminal/component/config/defaults.kt
+++ b/terminal/src/main/java/com/evolinx/terminal/component/config/defaults.kt
@@ -29,6 +29,8 @@ object NeoTermPath {
const val ROOT_PATH = "/data/data/com.evolinx.terminal/files"
const val USR_PATH = "$ROOT_PATH/usr"
const val BIN_PATH = "$USR_PATH/bin"
+ const val SBIN_PATH = "$USR_PATH/sbin"
+ const val EXTRA_PATH = "/bin:/sbin:/xbin:/usr/bin:/usr/sbin:/usr/xbin"
const val HOME_PATH = "$USR_PATH/home"
const val APT_BIN_PATH = "$USR_PATH/bin/apt"
const val LIB_PATH = "$USR_PATH/lib"
diff --git a/terminal/src/main/java/com/evolinx/terminal/component/pm/helper.kt b/terminal/src/main/java/com/evolinx/terminal/component/pm/helper.kt
index f4069c8..d418c99 100644
--- a/terminal/src/main/java/com/evolinx/terminal/component/pm/helper.kt
+++ b/terminal/src/main/java/com/evolinx/terminal/component/pm/helper.kt
@@ -82,9 +82,8 @@ object SourceHelper {
fun copySourceFromChroot() {
val APP_MNT = NeoTermPath.USR_PATH
- val MNT = "/data/local/nhsystem/kalifs"
- val sources = "$MNT/etc/apt/sources.list"
- val lists = "$MNT/var/lib/apt/lists"
+ val sources = "$APP_MNT/etc/apt/sources.list"
+ val lists = "$APP_MNT/var/lib/apt/lists"
// Make sure that nhterm has locally required apt dir's
Shell.cmd("mkdir -p $APP_MNT/etc/apt").exec()
diff --git a/terminal/src/main/java/com/evolinx/terminal/component/session/shell.kt b/terminal/src/main/java/com/evolinx/terminal/component/session/shell.kt
index c2f984f..f29f54e 100644
--- a/terminal/src/main/java/com/evolinx/terminal/component/session/shell.kt
+++ b/terminal/src/main/java/com/evolinx/terminal/component/session/shell.kt
@@ -334,6 +334,8 @@ open class ShellTermSession private constructor(
val termEnv = "TERM=xterm-256color"
val homeEnv = "HOME=" + NeoTermPath.HOME_PATH
+ val extraPathEnv = NeoTermPath.EXTRA_PATH
+ val pathEnv = "PATH=" + NeoTermPath.BIN_PATH + ":" + NeoTermPath.SBIN_PATH + ":" + extraPathEnv + ":" + System.getenv("PATH")
val prefixEnv = "PREFIX=" + NeoTermPath.USR_PATH
val androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT")
val androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA")
@@ -349,11 +351,9 @@ open class ShellTermSession private constructor(
val pwdEnv = "PWD=$selectedCwd"
val tmpdirEnv = "TMPDIR=${NeoTermPath.USR_PATH}/tmp"
val langEnv = "LANG=en_US.UTF-8"
- val extraPath = "/sbin:/system/sbin:/xbin:/system/xbin"
val ps1 = "PS1=\\[\\e[1;32m\\]\\u [ \\[\\e[0m\\]\\w\\[\\e[1;32m\\] ]\$ \\[\\e[0m\\]"
return if (systemShell) {
- val pathEnv = "PATH=" + extraPath + ":" + System.getenv("PATH")
arrayOf(
termEnv, pwdEnv, homeEnv, androidRootEnv, androidDataEnv,
externalStorageEnv, pathEnv, prefixEnv,
@@ -364,7 +364,7 @@ open class ShellTermSession private constructor(
} else {
val langEnv = "LANG=en_US.UTF-8"
- val pathEnv = "PATH=" + extraPath + ":" + buildPathEnv() + System.getenv("PATH")
+ val pathEnv = "PATH=" + extraPathEnv + ":" + buildPathEnv() + System.getenv("PATH")
arrayOf(termEnv, pwdEnv, pathEnv,
colorterm, langEnv
@@ -375,7 +375,7 @@ open class ShellTermSession private constructor(
}
private fun buildLdLibraryEnv(): String {
- return "${NeoTermPath.USR_PATH}/lib"
+ return "${NeoTermPath.USR_PATH}/lib:${NeoTermPath.USR_PATH}/lib32:${NeoTermPath.USR_PATH}/lib64"
}
private fun buildPathEnv(): String {
diff --git a/terminal/src/main/java/com/evolinx/terminal/services/NeoTermService.kt b/terminal/src/main/java/com/evolinx/terminal/services/NeoTermService.kt
index 557e046..ad4c2af 100644
--- a/terminal/src/main/java/com/evolinx/terminal/services/NeoTermService.kt
+++ b/terminal/src/main/java/com/evolinx/terminal/services/NeoTermService.kt
@@ -190,8 +190,6 @@ class NeoTermService : Service() {
}
private fun createNotificationChannel() {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
-
val channel = NotificationChannel(DEFAULT_CHANNEL_ID, "Evolinx", NotificationManager.IMPORTANCE_LOW)
channel.description = "Evolinx notifications"
val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
diff --git a/terminal/src/main/res/drawable/ic_launcher_foreground.xml b/terminal/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..e4a7728
--- /dev/null
+++ b/terminal/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/terminal/src/main/res/drawable/launcher.xml b/terminal/src/main/res/drawable/launcher.xml
new file mode 100644
index 0000000..4a4964c
--- /dev/null
+++ b/terminal/src/main/res/drawable/launcher.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09b..7353dbd 100644
--- a/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09b..7353dbd 100644
--- a/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/terminal/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/terminal/src/main/res/mipmap-hdpi/ic_launcher.png b/terminal/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index d46bc0c..0000000
Binary files a/terminal/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-hdpi/ic_launcher.webp b/terminal/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000..ee7ee0f
Binary files /dev/null and b/terminal/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/terminal/src/main/res/mipmap-hdpi/ic_launcher_round.png b/terminal/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index f3ea4ca..0000000
Binary files a/terminal/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/terminal/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..ed80388
Binary files /dev/null and b/terminal/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/terminal/src/main/res/mipmap-mdpi/ic_launcher.png b/terminal/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 1918731..0000000
Binary files a/terminal/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-mdpi/ic_launcher.webp b/terminal/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000..e6f602b
Binary files /dev/null and b/terminal/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/terminal/src/main/res/mipmap-mdpi/ic_launcher_round.png b/terminal/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 9d1c1ad..0000000
Binary files a/terminal/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/terminal/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..137dc88
Binary files /dev/null and b/terminal/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/terminal/src/main/res/mipmap-xhdpi/ic_launcher.png b/terminal/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index 93e9734..0000000
Binary files a/terminal/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-xhdpi/ic_launcher.webp b/terminal/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000..053f9a3
Binary files /dev/null and b/terminal/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/terminal/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/terminal/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 6ac8787..0000000
Binary files a/terminal/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/terminal/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..8e456b2
Binary files /dev/null and b/terminal/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/terminal/src/main/res/mipmap-xxhdpi/ic_launcher.png b/terminal/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 0987e91..0000000
Binary files a/terminal/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/terminal/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..d33e328
Binary files /dev/null and b/terminal/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/terminal/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/terminal/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index c8b0600..0000000
Binary files a/terminal/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/terminal/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..9703f87
Binary files /dev/null and b/terminal/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 8ae7b33..0000000
Binary files a/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..b7e5e80
Binary files /dev/null and b/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index e0d579a..0000000
Binary files a/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..d9aa68f
Binary files /dev/null and b/terminal/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/terminal/src/main/res/values/ic_launcher_background.xml b/terminal/src/main/res/values/ic_launcher_background.xml
index 0c85e35..f57d41c 100644
--- a/terminal/src/main/res/values/ic_launcher_background.xml
+++ b/terminal/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #595959
+ #0F1EC2
\ No newline at end of file