Code clean up

niranjan94 · niranjan94 · commit cf3e1bccd7f6 · 2015-12-02T13:26:40.000+05:30
diff --git a/app/src/main/java/com/njlabs/showjava/processor/JarExtractor.java b/app/src/main/java/com/njlabs/showjava/processor/JarExtractor.java
@@ -31,7 +31,7 @@
 @SuppressWarnings({"ResultOfMethodCallIgnored", "ConstantConditions"})
 public class JarExtractor extends ProcessServiceHelper {
 
-    private ArrayList<String> ignoredLibs;
+    private final ArrayList<String> ignoredLibs;
 
     public JarExtractor(ProcessService processService) {
         this.processService = processService;
@@ -64,7 +64,7 @@ public void run() {
         extractionThread.start();
     }
 
-    public void apkToDex() {
+    private void apkToDex() {
         DexFile dexFile = null;
         try {
             dexFile = DexFileFactory.loadDexFile(packageFilePath, 19);
@@ -109,7 +109,7 @@ public void apkToDex() {
         //////
     }
 
-    public void dexToJar() {
+    private void dexToJar() {
         Log.i("STATUS", "Jar Extraction Started");
 
         broadcastStatus("dex2jar");
@@ -187,7 +187,7 @@ private boolean isIgnored(String className) {
         return false;
     }
 
-    class DexExceptionHandlerMod implements DexExceptionHandler {
+    private class DexExceptionHandlerMod implements DexExceptionHandler {
         @Override
         public void handleFileException(Exception e) {
             Ln.d("Dex2Jar Exception " + e);
diff --git a/app/src/main/java/com/njlabs/showjava/processor/ProcessService.java b/app/src/main/java/com/njlabs/showjava/processor/ProcessService.java
@@ -45,12 +45,12 @@ public class ProcessService extends Service {
 
     public Handler UIHandler;
 
-    public Notify processNotify;
+    private Notify processNotify;
     public ApkParser apkParser;
 
     public String decompilerToUse = "cfr";
 
-    public int startID;
+    private int startID;
 
     public void onCreate() {
         super.onCreate();
@@ -106,7 +106,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         return START_NOT_STICKY;
     }
 
-    protected void handleIntent(Intent workIntent) {
+    private void handleIntent(Intent workIntent) {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         STACK_SIZE = Integer.valueOf(prefs.getString("thread_stack_size", String.valueOf(20 * 1024 * 1024)));
@@ -345,14 +345,14 @@ public IBinder onBind(Intent intent) {
         return null;
     }
 
-    public void kill() {
+    private void kill() {
         stopForeground(true);
         stopSelf();
     }
 
     private class ToastRunnable implements Runnable {
 
-        String mText;
+        final String mText;
 
         public ToastRunnable(String text) {
             mText = text;
diff --git a/app/src/main/java/com/njlabs/showjava/processor/ResourcesExtractor.java b/app/src/main/java/com/njlabs/showjava/processor/ResourcesExtractor.java
@@ -26,7 +26,7 @@
  */
 public class ResourcesExtractor extends ProcessServiceHelper {
 
-    ApkParser apkParser;
+    private final ApkParser apkParser;
 
     public ResourcesExtractor(ProcessService processService) {
         this.processService = processService;
diff --git a/app/src/main/java/com/njlabs/showjava/ui/AppListing.java b/app/src/main/java/com/njlabs/showjava/ui/AppListing.java
@@ -38,8 +38,8 @@
 
 public class AppListing extends BaseActivity {
 
-    ProgressDialog packageLoadDialog;
-    ListView listView = null;
+    private ProgressDialog packageLoadDialog;
+    private ListView listView = null;
     private boolean isDestroyed;
 
     @Override
@@ -72,7 +72,7 @@ private void dismissProgressDialog() {
         }
     }
 
-    public void setupList(ArrayList<PackageInfoHolder> AllPackages) {
+    private void setupList(ArrayList<PackageInfoHolder> AllPackages) {
         ArrayAdapter<PackageInfoHolder> aa = new ArrayAdapter<PackageInfoHolder>(getBaseContext(), R.layout.package_list_item, AllPackages) {
             @SuppressLint("InflateParams")
             @Override
diff --git a/app/src/main/java/com/njlabs/showjava/ui/AppProcessActivity.java b/app/src/main/java/com/njlabs/showjava/ui/AppProcessActivity.java
@@ -58,18 +58,21 @@ protected void onCreate(Bundle savedInstanceState) {
             appNameView.setText(extras.getString("package_label"));
             packageFilePath = extras.getString("package_file_path");
 
-            try {
-                ApkParser apkParser = new ApkParser(new File(packageFilePath));
-                appNameView.setText(apkParser.getApkMeta().getLabel());
-            } catch (Exception e) {
-                Ln.e(e);
-                exitWithError();
-            }
+            if(packageFilePath != null ){
+                try {
+                    ApkParser apkParser = new ApkParser(new File(packageFilePath));
+                    appNameView.setText(apkParser.getApkMeta().getLabel());
+                } catch (Exception e) {
+                    Ln.e(e);
+                    exitWithError();
+                }
 
-            if(extras.containsKey("decompiler")){
-                decompilerToUse = extras.getString("decompiler");
+                if(extras.containsKey("decompiler")){
+                    decompilerToUse = extras.getString("decompiler");
+                }
+            } else {
+                finish();
             }
-
         } else {
             packageFilePath = (new File(URI.create(getIntent().getDataString()))).getAbsolutePath();
             if (FilenameUtils.isExtension(packageFilePath, "apk")) {
diff --git a/app/src/main/java/com/njlabs/showjava/ui/BaseActivity.java b/app/src/main/java/com/njlabs/showjava/ui/BaseActivity.java
@@ -79,7 +79,7 @@ private void setupToolbar(String title) {
             getSupportActionBar().setTitle(title);
         } else {
             if(isPro()) {
-                ActivityInfo activityInfo = null;
+                ActivityInfo activityInfo;
                 try {
                     activityInfo = getPackageManager().getActivityInfo(getComponentName(), PackageManager.GET_META_DATA);
                     String currentTitle = activityInfo.loadLabel(getPackageManager()).toString();
diff --git a/app/src/main/java/com/njlabs/showjava/ui/FilePicker.java b/app/src/main/java/com/njlabs/showjava/ui/FilePicker.java
@@ -6,7 +6,6 @@
 import android.support.v7.app.ActionBar;
 import android.view.MenuItem;
 
-import com.njlabs.showjava.R;
 import com.nononsenseapps.filepicker.AbstractFilePickerActivity;
 import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
 
@@ -16,7 +15,7 @@
 
 public class FilePicker extends AbstractFilePickerActivity<File> {
 
-    FilePickerFragment currentFragment;
+    private FilePickerFragment currentFragment;
 
     @Override
     protected void attachBaseContext(Context newBase) {
diff --git a/app/src/main/java/com/njlabs/showjava/ui/FilePickerFragment.java b/app/src/main/java/com/njlabs/showjava/ui/FilePickerFragment.java
@@ -36,7 +36,7 @@ protected boolean isItemVisible(final File file) {
      * For consistency, the top level the back button checks against should be the start path.
      * But it will fall back on /.
      */
-    public File getBackTop() {
+    private File getBackTop() {
         if (getArguments().containsKey(KEY_START_PATH)) {
             String keyStartPath = getArguments().getString(KEY_START_PATH);
             return getPath((keyStartPath != null ? keyStartPath : "/"));
diff --git a/app/src/main/java/com/njlabs/showjava/ui/JavaExplorer.java b/app/src/main/java/com/njlabs/showjava/ui/JavaExplorer.java
@@ -36,9 +36,9 @@
 
 public class JavaExplorer extends BaseActivity {
 
-    ListView lv;
-    String packageID;
-    ActionBar actionBar;
+    private ListView lv;
+    private String packageID;
+    private ActionBar actionBar;
     private File currentDir;
     private FileArrayAdapter adapter;
     private String sourceDir;
@@ -169,18 +169,14 @@ private void dismissProgressDialog() {
         }
     }
 
-    public class SourceArchiver extends AsyncTask<String, String, File> {
+    private class SourceArchiver extends AsyncTask<String, String, File> {
 
         @Override
         protected File doInBackground(String... params) {
             publishProgress("Compressing source files ...");
             return Utils.zipDir(new File(sourceDir), packageID);
         }
 
-        public void doProgress(String progress){
-            publishProgress(progress);
-        }
-
         @Override
         protected void onPostExecute(File zipFilePath) {
             dismissProgressDialog();
diff --git a/app/src/main/java/com/njlabs/showjava/ui/PurchaseActivity.java b/app/src/main/java/com/njlabs/showjava/ui/PurchaseActivity.java
@@ -20,9 +20,9 @@
 
 public class PurchaseActivity extends BaseActivity implements BillingProcessor.IBillingHandler {
 
-    BillingProcessor bp;
-    ProgressBar progressBar;
-    LinearLayout mainLayout;
+    private BillingProcessor bp;
+    private ProgressBar progressBar;
+    private LinearLayout mainLayout;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/njlabs/showjava/ui/SettingsActivity.java b/app/src/main/java/com/njlabs/showjava/ui/SettingsActivity.java
@@ -39,7 +39,7 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
 
-    private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
+    private static final Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
         @Override
         public boolean onPreferenceChange(Preference preference, Object value) {
             String stringValue = value.toString();
diff --git a/app/src/main/java/com/njlabs/showjava/ui/SourceViewer.java b/app/src/main/java/com/njlabs/showjava/ui/SourceViewer.java
@@ -24,8 +24,8 @@
 
 public class SourceViewer extends BaseActivity {
 
-    String sourceFilePath;
-    String sourceFilename;
+    private String sourceFilePath;
+    private String sourceFilename;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/njlabs/showjava/utils/AesCbcWithIntegrity.java b/app/src/main/java/com/njlabs/showjava/utils/AesCbcWithIntegrity.java
@@ -764,7 +764,6 @@ private static void installLinuxPRNGSecureRandom() throws SecurityException {
                         Log.w(PrngFixes.class.getSimpleName(),
                                 "SecureRandom.getInstance(\"SHA1PRNG\") backed by wrong" + " Provider: "
                                         + rng2.getProvider().getClass());
-                        return;
                     } else {
                         throw new SecurityException(
                                 "SecureRandom.getInstance(\"SHA1PRNG\") backed by wrong" + " Provider: "
diff --git a/app/src/main/java/com/njlabs/showjava/utils/FileArrayAdapter.java b/app/src/main/java/com/njlabs/showjava/utils/FileArrayAdapter.java
@@ -18,9 +18,9 @@
 
 public class FileArrayAdapter extends ArrayAdapter<Item> {
 
-    private Context context;
-    private int id;
-    private List<Item> items;
+    private final Context context;
+    private final int id;
+    private final List<Item> items;
 
     public FileArrayAdapter(Context context, int textViewResourceId,
                             List<Item> objects) {
diff --git a/app/src/main/java/com/njlabs/showjava/utils/SourceInfo.java b/app/src/main/java/com/njlabs/showjava/utils/SourceInfo.java
@@ -15,11 +15,11 @@
  */
 public class SourceInfo {
 
-    public String packageLabel;
-    public String packageName;
-    public boolean hasSource;
+    private String packageLabel;
+    private String packageName;
+    private final boolean hasSource;
 
-    public SourceInfo(String packageLabel, String packageName) {
+    private SourceInfo(String packageLabel, String packageName) {
         this.packageLabel = packageLabel;
         this.packageName = packageName;
         this.hasSource = true;
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
@@ -4,26 +4,26 @@
     <item
         android:id="@+id/bug_report_option"
         android:orderInCategory="1"
-        android:title="Report a Bug"
+        android:title="@string/report_a_bug"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/about_option"
         android:orderInCategory="2"
-        android:title="About"
+        android:title="@string/about"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/settings_option"
         android:orderInCategory="2"
-        android:title="Settings"
+        android:title="@string/settings"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/invert_colors"
         android:icon="@drawable/ic_action_invert_colors"
         android:orderInCategory="2"
-        android:title="Invert Background Color"
+        android:title="@string/invert_background_color"
         android:visible="false"
         app:showAsAction="always" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -6,13 +6,7 @@
 
     <color name="black">#000000</color>
     <color name="grey_900">#212121</color>
-    <color name="grey_800">#424242</color>
     <color name="grey_700">#616161</color>
-    <color name="grey_600">#757575</color>
-    <color name="grey_500">#9E9E9E</color>
     <color name="grey_400">#BDBDBD</color>
-    <color name="grey_300">#E0E0E0</color>
-    <color name="grey_200">#EEEEEE</color>
-    <color name="grey_100">#F5F5F5</color>
     <color name="white">#ffffff</color>
 </resources>
