fix session creation in rooted installer

increment version
Aefyr · Aug 29, 2019 · 06ffc52 · 06ffc52
1 parent 755469d
commit 06ffc52
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.aefyr.sai"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 33
-        versionName "2.3"
+        versionCode 34
+        versionName "2.4"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/aefyr/sai/installer/rooted/RootedSAIPackageInstaller.java b/app/src/main/java/com/aefyr/sai/installer/rooted/RootedSAIPackageInstaller.java
@@ -126,19 +126,25 @@ private int createSession() throws RuntimeException {
         List<Pair<String, String>> attemptedCommands = new ArrayList<>();
 
         for (String commandToAttempt : commandsToAttempt) {
-            String result = ensureCommandSucceeded(Root.exec(commandToAttempt));
-            attemptedCommands.add(new Pair<>(commandToAttempt, result));
+            Root.Result result = Root.exec(commandToAttempt);
+            attemptedCommands.add(new Pair<>(commandToAttempt, result.toString()));
 
-            Integer sessionId = extractSessionId(result);
+            if (!result.isSuccessful()) {
+                Log.w(TAG, String.format("Command failed: %s > %s", commandToAttempt, result));
+                continue;
+            }
+
+            Integer sessionId = extractSessionId(result.out);
             if (sessionId != null)
                 return sessionId;
             else
                 Log.w(TAG, String.format("Command failed: %s > %s", commandToAttempt, result));
         }
 
         StringBuilder exceptionMessage = new StringBuilder("Unable to create session, attempted commands: ");
+        int i = 1;
         for (Pair<String, String> attemptedCommand : attemptedCommands) {
-            exceptionMessage.append("\n\n==========================\n")
+            exceptionMessage.append("\n\n").append(i++).append(") ==========================\n")
                     .append(attemptedCommand.first)
                     .append("\nVVVVVVVVVVVVVVVV\n")
                     .append(attemptedCommand.second);