core initialization does not belong to the update task ( closes #247 , merge #248 )

Author: tux-mind

cSploit/src/org/csploit/android/MainActivity.java

@@ -117,6 +117,7 @@ public class MainActivity extends ActionBarActivity implements NetworkRadar.Targ
     private long mLastBackPressTime = 0;
     private ActionMode mActionMode = null;
     private ListView lv;
+    private boolean isRootMissing = false;
 
     private void createUpdateStatusText() {
         if (mUpdateStatus != null) return;
@@ -243,7 +244,37 @@ public void run() {
         });
     }
 
+    private boolean startCore() {
+        isRootMissing = false;
+        try {
+            System.initCore();
+
+            return true;
+        } catch (System.SuException e) {
+            onInitializationError(getString(R.string.only_4_root));
+            isRootMissing = true;
+        } catch (System.DaemonException e) {
+            Logger.error(e.getMessage());
+        }
+
+        return false;
+    }
+
+    private void onCoreBeating() {
+        if(Client.hadCrashed()) {
+            Logger.warning("Client has previously crashed, building a crash report.");
+            CrashReporter.notifyNativeLibraryCrash();
+            onInitializationError(getString(R.string.JNI_crash_detected));
+        }
+    }
+
     private void onCoreUpdated() {
+        if(startCore()) {
+            onCoreBeating();
+        } else if ( isRootMissing ) {
+            return;
+        }
+
         MainActivity.this.runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -338,21 +369,12 @@ public void run() {
         boolean coreBeating = System.isCoreInitialized();
 
         if (coreInstalled && !coreBeating) {
-          try {
-            System.initCore();
-            coreBeating = true;
-
-            if(Client.hadCrashed()) {
-              Logger.warning("Client has previously crashed, building a crash report.");
-              CrashReporter.notifyNativeLibraryCrash();
-              onInitializationError(getString(R.string.JNI_crash_detected));
+            coreBeating = startCore();
+            if(coreBeating) {
+                onCoreBeating();
+            } else if ( isRootMissing ) {
+                return;
             }
-          } catch (System.SuException e) {
-            onInitializationError(getString(R.string.only_4_root));
-            return;
-          } catch (System.DaemonException e) {
-            Logger.error(e.getMessage());
-          }
         }
 
         if (!connectivityAvailable) {

cSploit/src/org/csploit/android/core/UpdateService.java

@@ -1430,8 +1430,6 @@ protected void onHandleIntent(Intent intent) {
           installGems();
         else if (what_to_do == action.gems_update)
           updateGems();
-        else if (what_to_do == action.core_update)
-          System.initCore();
 
         deleteTemporaryFiles();
         createVersionFile();
@@ -1482,11 +1480,6 @@ else if (what_to_do == action.core_update)
     } catch (ChildManager.ChildDiedException e) {
       sendError(what_to_do, R.string.error_occured);
       System.errorLogging(e);
-    } catch (System.SuException e) {
-      sendError(what_to_do, R.string.only_4_root);
-    } catch (System.DaemonException e) {
-      sendError(what_to_do, R.string.heart_attack);
-      Logger.error(e.getMessage());
     } finally {
       if(exitForError) {
         if(what_to_do == action.msf_update || what_to_do == action.gems_update)