Pass a context into getSuVersion() instead of keeping one around static in Su

Author: ChainsDD

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 static Context mContext;
+    private Context mContext;
     private String mMaliciousAppPackage = "";
 
 	@Override
@@ -89,7 +89,7 @@ private void firstRun() {
 		}
 		Log.d(TAG, "First run for version " + versionCode);
 
-		String suVer = getSuVersion();
+		String suVer = getSuVersion(this);
 		Log.d(TAG, "su version: " + suVer);
 		new Updater(this, suVer).doUpdate();
 
@@ -155,7 +155,7 @@ public void onClick(DialogInterface dialog, int which) {
 	    }
     }
 
-    public static String getSuVersion()
+    public static String getSuVersion(Context context)
     {
     	Process process = null;
     	try {
@@ -172,13 +172,13 @@ public static String getSuVersion()
 	    			}
 	    			counter++;
     			}
-    			return " " + mContext.getString(R.string.su_original);
+    			return " " + context.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 " " + mContext.getString(R.string.su_original);
+    		return " " + context.getString(R.string.su_original);
     	} catch (InterruptedException e) {
     		Log.e(TAG, "Call to su failed.", e);
     		return " ...";

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

@@ -1,5 +1,6 @@
 package com.noshufou.android.su;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.PackageInfo;
@@ -15,11 +16,15 @@
 public class SuPreferences extends PreferenceActivity implements OnSharedPreferenceChangeListener,
         OnPreferenceClickListener {
 //	private static final String TAG = "Su.SuPreferences";
+    
+    private Context mContext;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
+        
+        mContext = this;
 
         Preference versionPreference = getPreferenceScreen().findPreference("pref_version");
         versionPreference.setTitle(getString(R.string.pref_version_title, getSuperuserVersion()));
@@ -61,7 +66,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
     public boolean onPreferenceClick(Preference preference) {
 	    if (preference.getKey().equals("pref_bin_version")) {
 	        Toast.makeText(this, R.string.checking, Toast.LENGTH_SHORT).show();
-	        new Updater(this, Su.getSuVersion()).doUpdate();
+	        new Updater(this, Su.getSuVersion(mContext)).doUpdate();
 	        return true;
 	    } else if (preference.getKey().equals("pref_clear_log")) {
 	        DBHelper db = new DBHelper(this);
@@ -98,7 +103,7 @@ private class ShowBinVersion extends AsyncTask<String, Integer, Boolean> {
 
         @Override
         protected Boolean doInBackground(String... params) {
-            suVersion = Su.getSuVersion();
+            suVersion = Su.getSuVersion(mContext);
             return null;
         }