x1ongzhu пре 1 година
родитељ
комит
0a049ea8c3

+ 6 - 1
app/build.gradle

@@ -56,7 +56,12 @@ android {
         correctErrorTypes = true
         correctErrorTypes = true
     }
     }
 }
 }
-
+configurations {
+    configureEach {
+        exclude module: 'httpclient'
+        exclude module: 'commons-logging'
+    }
+}
 dependencies {
 dependencies {
 
 
     testImplementation libs.junit
     testImplementation libs.junit

+ 5 - 1
app/proguard-rules.pro

@@ -18,4 +18,8 @@
 
 
 # If you keep the line number information, uncomment this to
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+-keepclassmembers class com.example.modifier.model.TelephonyConfig {
+    *;
+}

+ 1 - 1
app/src/main/java/com/example/modifier/Global.kt

@@ -25,7 +25,7 @@ object Global {
     fun load() {
     fun load() {
         val context = Utils.getContext()
         val context = Utils.getContext()
         val prefs = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
         val prefs = context.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
-        serverUrl = prefs.getString("server", "http://192.168.6.215:3000")
+        serverUrl = prefs.getString("server", "https://rcs.izouma.com")
         name = prefs.getString("name", Build.DEVICE)
         name = prefs.getString("name", Build.DEVICE)
         try {
         try {
             val file = File(ContextCompat.getDataDir(context), "config.json")
             val file = File(ContextCompat.getDataDir(context), "config.json")

+ 1 - 1
app/src/main/java/com/example/modifier/Utils.java

@@ -52,7 +52,7 @@ public class Utils {
 
 
     public static String runAsRoot(String... cmds) throws IOException, InterruptedException {
     public static String runAsRoot(String... cmds) throws IOException, InterruptedException {
         Log.i(TAG, "Trying to run as root");
         Log.i(TAG, "Trying to run as root");
-        Process p = new ProcessBuilder("su -M").start();
+        Process p = new ProcessBuilder("su", "-M").start();
 
 
         StringBuilder res = new StringBuilder();
         StringBuilder res = new StringBuilder();
         StringBuilder err = new StringBuilder();
         StringBuilder err = new StringBuilder();