adding validations and some refactoring

Author: ajitsing

bin/apkToJava

@@ -5,10 +5,40 @@ include ApkToJava::Operations
 include ApkToJava::Setup
 include ApkToJava::PrettyPrinter
 
-def execute
+def apk_exists?
+  File.exists? ARGV[0]
+end
+
+def has_apk_extension?
+  ARGV[0].split('/').last.split('.').last == 'apk'
+end
+
+def wrong_usage
+  print_info "Wrong Usage! Right usage is -"
+  print_success "apkToJava path/to/apk/file"
+end
+
+def valid_usage?
   apk_file = ARGV[0]
-  initialize_setup if !env_setup?
-  view_as_java_code apk_file
+  if ARGV.size > 1 || ARGV.empty?
+    wrong_usage
+    false
+  elsif !apk_exists?
+    print_error "#{apk_file} file does not exists!"
+    false
+  elsif !has_apk_extension?
+    print_error "#{apk_file} is not an APK file!"
+    false
+  else
+    true
+  end
+end
+
+def execute
+  if valid_usage?
+    initialize_setup if !env_setup?
+    view_as_java_code ARGV[0]
+  end
 end
 
 execute

lib/apk_to_java.rb

@@ -19,11 +19,11 @@ def install_jadx
     end
 
     def jadx_installed?
-      !`ls #{ApkToJava::JADX}`.empty?
+      File.exists? ApkToJava::JADX
     end
 
     def dex_to_jar_installed?
-      !`ls #{ApkToJava::DEX_TO_JAR}`.empty?
+      File.exists? ApkToJava::DEX_TO_JAR
     end
 
     def env_setup?
@@ -39,53 +39,68 @@ def initialize_setup
   end
 
   module Operations
-    def convert_to_dex(apk)
-      print_info "Converting to dex.."
-      `mkdir apkToJava`
-      `cp #{apk} apkToJava/`
-      apk_name = apk.split('/').last.split('.').first
-      apk = "apkToJava/#{apk_name}"
-      `mv apkToJava/#{apk_name}.apk apkToJava/#{apk_name}.zip`
-      `unzip apkToJava/#{apk_name}.zip -d apkTojava/`
-      `#{ApkToJava::DEX_TO_JAR} apkTojava/classes.dex`
-      print_success "Done!"
-      `pwd`.chomp + "/apkTojava/classes.dex"
+    TEMP_DIR = 'apkToJavaTmp'
+
+    def copy_apk(apk)
+      `mkdir #{TEMP_DIR}`
+      `cp #{apk} #{TEMP_DIR}/`
     end
 
-    def dex_to_jar(apk)
-      remove_existing_jar if jar_exists?
-      dex_file = convert_to_dex apk
-      print_info "Converting dex to jar.."
-      command = ApkToJava::DEX_TO_JAR + " #{dex_file}"
-      `#{command}`
-      print_success "Done!"
-      `pwd`.chomp + '/classes-dex2jar.jar'
+    def unzip(apk_name)
+      `mv #{TEMP_DIR}/#{apk_name}.apk #{TEMP_DIR}/#{apk_name}.zip`
+      `unzip #{TEMP_DIR}/#{apk_name}.zip -d #{TEMP_DIR}/`
+    end
+
+    def create_dex
+      `#{ApkToJava::DEX_TO_JAR} #{TEMP_DIR}/classes.dex`
     end
 
-    def jar_exists?
-      print `ls #{`pwd`.chomp}/classes-dex2jar.jar`
-      !`ls #{`pwd`.chomp}/classes-dex2jar.jar`.empty?
+    def path_to_dex
+      `pwd`.chomp + "/#{TEMP_DIR}/classes.dex"
     end
 
-    def remove_existing_jar
-      print_info "Removing existing jar.."
-      `rm #{`pwd`.chomp}/classes-dex2jar.jar`
+    def create_jar(dex_file)
+      `#{ApkToJava::DEX_TO_JAR} #{dex_file} --force`
+    end
+
+    def path_to_jar
+      `pwd`.chomp + '/classes-dex2jar.jar'
     end
 
     def clean_up
       print_info "Cleaning the mess.."
-      `rm -rf apkToJava`
+      `rm -rf #{TEMP_DIR}`
       print_success "done!"
     end
 
+    def open_code_in_gui(jar_file)
+      `#{ApkToJava::JADX}  #{jar_file} &`
+    end
+
+    def convert_to_dex(apk)
+      print_info "Converting to dex.."
+      copy_apk apk
+      apk_name = apk.split('/').last.split('.').first
+      unzip apk_name
+      create_dex
+      print_success "Done!"
+      path_to_dex
+    end
+
+    def dex_to_jar(apk)
+      dex_file = convert_to_dex apk
+      print_info "Converting dex to jar.."
+      create_jar dex_file
+      print_success "Done!"
+      path_to_jar
+    end
+
     def view_as_java_code(apk)
       jar_file = dex_to_jar apk
       clean_up
       print_info "Opening in gui interface.."
-
-      command = ApkToJava::JADX + " #{jar_file} &"
       print_success "Please be patient, apkToJava might take some time to load your project in gui interface"
-      `#{command}`
+      open_code_in_gui jar_file
     end
   end
 end