Possible fix for stuck at optimizing bug

Author: niranjan94

app/src/main/java/com/njlabs/showjava/ui/AppProcessActivity.java

@@ -95,6 +95,12 @@ protected void onCreate(Bundle savedInstanceState) {
         CurrentStatus.setEllipsize(TextUtils.TruncateAt.END);
         CurrentStatus.setLines(1);
 
+        setupGears();
+
+        registerBroadcastReceiver();
+    }
+
+    private void setupGears(){
         final ImageView GearProgressLeft = (ImageView) findViewById(R.id.gear_progress_left);
         final ImageView GearProgressRight = (ImageView) findViewById(R.id.gear_progress_right);
 
@@ -120,11 +126,9 @@ public void run() {
                 GearProgressRight.setAnimation(GearProgressRightAnim);
             }
         });
-
-        registerBroadcastReceiver();
     }
 
-    public void startProcessorService() {
+    private void startProcessorService() {
         Utils.killAllProcessorServices(this);
         Intent mServiceIntent = new Intent(getContext(), ProcessService.class);
         mServiceIntent.setAction(Constants.ACTION.START_PROCESS);
@@ -133,7 +137,7 @@ public void startProcessorService() {
         startService(mServiceIntent);
     }
 
-    public void registerBroadcastReceiver() {
+    private void registerBroadcastReceiver() {
         IntentFilter statusIntentFilter = new IntentFilter(Constants.PROCESS_BROADCAST_ACTION);
         registerReceiver(processStatusReceiver, statusIntentFilter);
     }
@@ -159,9 +163,9 @@ private boolean fromNotification() {
     }
 
     private void exitWithError() {
+        Toast.makeText(baseContext, "There was an error initialising the decompiler with the app you selected.", Toast.LENGTH_LONG).show();
         finish();
         overridePendingTransition(R.anim.fadein, R.anim.fadeout);
-        Toast.makeText(baseContext, "There was an error initialising the decompiler with the app you selected.", Toast.LENGTH_LONG).show();
     }
 
     @Override
@@ -189,13 +193,16 @@ public void onReceive(Context context, Intent intent) {
                 case "optimise_dex_start":
                     CurrentStatus.setText("Optimising dex file");
                     break;
+
                 case "optimising":
                     CurrentStatus.setText("Optimising dex file");
                     CurrentLine.setText("");
                     break;
+
                 case "optimise_dex_finish":
                     CurrentStatus.setText("Finishing optimisation");
                     break;
+
                 case "merging_classes":
                     CurrentStatus.setText("Merging classes");
                     CurrentLine.setText("");
@@ -209,7 +216,6 @@ public void onReceive(Context context, Intent intent) {
                         startActivityForResult(iOne, 1);
                         overridePendingTransition(R.anim.fadein, R.anim.fadeout);
                     }
-
                     break;
 
                 case "start_activity_with_error":
@@ -224,6 +230,7 @@ public void onReceive(Context context, Intent intent) {
                     break;
 
                 case "exit_process_on_error":
+                    Toast.makeText(baseContext, "Exiting with error.", Toast.LENGTH_SHORT).show();
                     finish();
                     overridePendingTransition(R.anim.fadein, R.anim.fadeout);
                     break;
@@ -236,16 +243,21 @@ public void onReceive(Context context, Intent intent) {
                 case "dex2jar":
                     CurrentStatus.setText("Decompiling dex to jar");
                     break;
+
                 case "jar2java":
                     CurrentStatus.setText("Decompiling to java");
                     break;
+
                 case "res":
                     CurrentStatus.setText("Extracting Resources");
                     break;
+
                 case "exit":
+                    Toast.makeText(baseContext, "Exiting.", Toast.LENGTH_SHORT).show();
                     finish();
                     overridePendingTransition(R.anim.fadein, R.anim.fadeout);
                     break;
+
                 default:
                     CurrentLine.setText(statusData);
             }

app/src/main/java/com/njlabs/showjava/ui/SourceViewer.java

@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-@SuppressWarnings("deprecation")
 public class SourceViewer extends BaseActivity {
 
     String sourceFilePath;

app/src/main/java/com/njlabs/showjava/utils/Utils.java

@@ -2,8 +2,11 @@
 
 import android.app.ActivityManager;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Environment;
 
+import com.njlabs.showjava.Constants;
+import com.njlabs.showjava.processor.ProcessService;
 import com.njlabs.showjava.utils.logging.Ln;
 
 import java.io.File;
@@ -16,6 +19,11 @@
 public class Utils {
 
     public static void killAllProcessorServices(Context context) {
+
+        Intent mServiceIntent = new Intent(context, ProcessService.class);
+        mServiceIntent.setAction(Constants.ACTION.STOP_PROCESS);
+        context.startService(mServiceIntent);
+
         ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         List<ActivityManager.RunningAppProcessInfo> runningAppProcesses = am.getRunningAppProcesses();
         for (ActivityManager.RunningAppProcessInfo next : runningAppProcesses) {