Commit: 2a71bef0dfd91d8cf4adf52ff4aa617102531258 - packages-apps-Superuser (git)

packages/apps/Superuser

Commit MetaInfo

• Revisão: 2a71bef0dfd91d8cf4adf52ff4aa617102531258 (tree)
• Hora: 2010-08-28 15:31:06
• Autor: tprochazka <tomas.prochazka@atom...>
• Commiter: tprochazka

Mensagem de Log

- fixed problem with freeze on startup if original version of su is avalaible on device and "su -v" doesn't return any stream and application will block on readLine() method.
+ added nullpointer exception handling if downloading of manifest file failed from some reason
* if "su -v" doesn't return nothing version will be show as 'original'

Mudança Sumário

• modified: res/values/strings.xml
• modified: src/com/noshufou/android/su/Su.java
• modified: src/com/noshufou/android/su/Updater.java

Diff

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,8 @@
     <string name="su_up_to_date">su is up to date</string>
     <string name="checking">Checking...</string>
     <string name="no_connection">No network connection. Could not check for updates</string>
+    <string name="manifest_download_failed">Checking avalaible version failed</string>
+    <string name="su_original">original</string>
     
     <string name="tab_apps">Apps</string>
     <string name="tab_log">Log</string>

--- a/src/com/noshufou/android/su/Su.java
+++ b/src/com/noshufou/android/su/Su.java
@@ -2,8 +2,11 @@ package com.noshufou.android.su;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import org.w3c.dom.ProcessingInstruction;
+
 import android.app.TabActivity;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -85,13 +88,25 @@ public class Su extends TabActivity {
     	Process process = null;
     	try {
     		process = Runtime.getRuntime().exec("su -v");
-    		BufferedReader stdInput = new BufferedReader(new InputStreamReader(process.getInputStream()));
-            String suVersion = stdInput.readLine();
-    		stdInput.close();
-    		return suVersion;
+    		InputStream processInputStream = process.getInputStream();
+    		BufferedReader stdInput = new BufferedReader(new InputStreamReader(processInputStream));
+    		Thread.sleep(500);
+    		try {
+    			if (stdInput.ready()) {
+    				String suVersion = stdInput.readLine();
+    				return suVersion;
+    			} else {
+    				return " " + R.string.su_original;
+    			}
+    		} finally {
+    			stdInput.close();
+    		}
     	} catch (IOException e) {
     		Log.e(TAG, "Call to su failed. Perhaps the wrong version of su is present", e);
-    		return null;
-    	}
+    		return " " + R.string.su_original;
+    	} catch (InterruptedException e) {
+    		Log.e(TAG, "Call to su failed.", e);
+    		return " ...";
+		}
     }
 }

--- a/src/com/noshufou/android/su/Updater.java
+++ b/src/com/noshufou/android/su/Updater.java
@@ -173,7 +173,9 @@ public class Updater {
 
         @Override
         protected void onPostExecute(String result) {
-            if (result.equals("manifest.json")) {
+        	if (result == null) {
+        		Toast.makeText(mContext, R.string.manifest_download_failed, Toast.LENGTH_SHORT).show();
+        	} else if (result.equals("manifest.json")) {
                 postManifest();
             } else if (result.equals("su")) {
                 new AutoUpdateTask().execute();