Rethink error catch login for CFR

Author: niranjan94

app/src/main/java/com/njlabs/showjava/processor/JavaExtractor.java

@@ -73,6 +73,7 @@ public void extract() {
             case "fernflower":
                 decompileWithFernFlower(jarInputFile, javaOutputDir);
                 break;
+
         }
 
     }
@@ -83,41 +84,38 @@ private void decompileWithCFR(File jarInputFile, File javaOutputDir){
 
         Options options = null;
         try {
-            options = (Options) getOptParser.parse(args, OptionsImpl.getFactory());
-        } catch (Exception e) {
-            Crashlytics.logException(e);
-            broadcastStatus("exit_process_on_error");
-        }
-
-        if(!options.optionIsSet(OptionsImpl.HELP) && options.getOption(OptionsImpl.FILENAME) != null) {
-            ClassFileSourceImpl classFileSource = new ClassFileSourceImpl(options);
-            final DCCommonState dcCommonState = new DCCommonState(options, classFileSource);
-            final String path = (String)options.getOption(OptionsImpl.FILENAME);
-            String type = (String)options.getOption(OptionsImpl.ANALYSE_AS);
-            if(type == null) {
-                type = dcCommonState.detectClsJar(path);
-            }
-
-            ThreadGroup group = new ThreadGroup("Jar 2 Java Group");
-            Thread javaExtractionThread = new Thread(group, new Runnable() {
-                @Override
-                public void run() {
-                    boolean javaError = false;
-                    try {
-                        Main.doJar(dcCommonState, path);
-                    } catch (Exception | StackOverflowError e) {
-                        Ln.e(e);
-                        javaError = true;
+            options = getOptParser.parse(args, OptionsImpl.getFactory());
+
+            if(!options.optionIsSet(OptionsImpl.HELP) && options.getOption(OptionsImpl.FILENAME) != null) {
+                ClassFileSourceImpl classFileSource = new ClassFileSourceImpl(options);
+                final DCCommonState dcCommonState = new DCCommonState(options, classFileSource);
+                final String path = options.getOption(OptionsImpl.FILENAME);
+
+                ThreadGroup group = new ThreadGroup("Jar 2 Java Group");
+                Thread javaExtractionThread = new Thread(group, new Runnable() {
+                    @Override
+                    public void run() {
+                        boolean javaError = false;
+                        try {
+                            Main.doJar(dcCommonState, path);
+                        } catch (Exception | StackOverflowError e) {
+                            Ln.e(e);
+                            javaError = true;
+                        }
+                        startXMLExtractor(!javaError);
                     }
-                    startXMLExtractor(!javaError);
-                }
-            }, "Jar to Java Thread", processService.STACK_SIZE);
+                }, "Jar to Java Thread", processService.STACK_SIZE);
 
-            javaExtractionThread.setPriority(Thread.MAX_PRIORITY);
-            javaExtractionThread.setUncaughtExceptionHandler(exceptionHandler);
-            javaExtractionThread.start();
+                javaExtractionThread.setPriority(Thread.MAX_PRIORITY);
+                javaExtractionThread.setUncaughtExceptionHandler(exceptionHandler);
+                javaExtractionThread.start();
 
-        } else {
+            } else {
+                broadcastStatus("exit_process_on_error");
+            }
+
+        } catch (Exception e) {
+            Crashlytics.logException(e);
             broadcastStatus("exit_process_on_error");
         }