- fixed bug which show number instead of original in preferences action if user have original version of su binary

+ added refresh displayed version of su binary in preferences action after update (before stay old version here)
* more effective way to detect su version (don't sleep too long with already updates su binary)
* move not translatable strings at the end of strings.xml to better compare translation for translators

Author: tprochazka

res/values/strings.xml

@@ -3,9 +3,6 @@
     <string name="app_name">Superuser</string>
     <string name="app_name_request">Superuser Request</string>
 
-    <!-- Do not translate -->
-    <string name="update_filename">su-2.3.1-bin-signed.zip</string>
-
     <string name="permlab_respond">respond to superuser requests</string>
     <string name="permdesc_respond">Allows the application to respond to requests for superuser access.</string>
 
@@ -30,10 +27,6 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
 
-    <!-- Do not translate -->
-    <string name="report_subject">Possibly malicious app found</string>
-    <string name="report_body">The following package was found to be requesting to respond to Superuser requests.\n\n - %s\n\nPlease investigate.</string>
-    
     <string name="tab_apps">Apps</string>
     <string name="tab_log">Log</string>
     <string name="tab_settings">Settings</string>
@@ -95,4 +88,9 @@
     <string name="pref_bin_version_summary">Tap to check for updates</string>
 
     <string name="notification_text">%s has been granted Superuser permissions</string>
+
+    <!-- Do not translate -->
+    <string name="report_subject">Possibly malicious app found</string>
+    <string name="report_body">The following package was found to be requesting to respond to Superuser requests.\n\n - %s\n\nPlease investigate.</string>
+    <string name="update_filename">su-2.3.1-bin-signed.zip</string>
 </resources>

src/com/noshufou/android/su/Su.java

@@ -29,7 +29,7 @@ public class Su extends TabActivity {
     private static final int PACKAGE_UNINSTALL = 1;
     private static final int SEND_REPORT = 2;
 
-    private Context mContext;
+    private static Context mContext;
     private String mMaliciousAppPackage = "";
 
 	@Override
@@ -162,20 +162,23 @@ public static String getSuVersion()
     		process = Runtime.getRuntime().exec("su -v");
     		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;
+    			int counter = 0;
+    			while(counter < 20) {
+	   				Thread.sleep(50);
+	    			if (stdInput.ready()) {
+	    				String suVersion = stdInput.readLine();
+	    				return suVersion;
+	    			}
+	    			counter++;
     			}
+    			return " " + mContext.getString(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 " " + R.string.su_original;
+    		return " " + mContext.getString(R.string.su_original);
     	} catch (InterruptedException e) {
     		Log.e(TAG, "Call to su failed.", e);
     		return " ...";

src/com/noshufou/android/su/SuPreferences.java

@@ -28,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
         db.close();
 
         Preference binVersionPreference = getPreferenceScreen().findPreference("pref_bin_version");
-        new ShowBinVersion().execute();
+        updateSuVersionInformation();
         binVersionPreference.setOnPreferenceClickListener(this);
 
         Preference clearLogPreference = getPreferenceScreen().findPreference("pref_clear_log");
@@ -72,6 +72,10 @@ public boolean onPreferenceClick(Preference preference) {
 	        return false;
 	    }
     }
+	
+	public void updateSuVersionInformation() {
+		new ShowBinVersion().execute();
+	}
 
     private String getSuperuserVersion()
     {

src/com/noshufou/android/su/Updater.java

@@ -240,6 +240,10 @@ protected Boolean doInBackground(String... params) {
         @Override
         protected void onPostExecute(Boolean result) {
             if (result) {
+                if (mContext instanceof SuPreferences) {
+                	// update version number after binary update
+                	((SuPreferences)mContext).updateSuVersionInformation();	
+                }
                 Toast.makeText(mContext, R.string.su_updated, Toast.LENGTH_SHORT).show();
             } else {
                 copyUpdateZip(true);