Merge pull request #246 from Microsoft/android-code-cleanup

Android code cleanup

Author: geof90

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -11,7 +11,7 @@
 
 public class CodePushDialog extends ReactContextBaseJavaModule{
 
-    Activity mainActivity;
+    private Activity mainActivity;
 
     public CodePushDialog(ReactApplicationContext reactContext, Activity mainActivity) {
         super(reactContext);

android/app/src/main/java/com/microsoft/codepush/react/CodePushDialog.java

@@ -6,7 +6,7 @@ public enum CodePushInstallMode {
     ON_NEXT_RESUME(2);
 
     private final int value;
-    private CodePushInstallMode(int value) {
+    CodePushInstallMode(int value) {
         this.value = value;
     }
     public int getValue() {

android/app/src/main/java/com/microsoft/codepush/react/CodePushInstallMode.java

@@ -1,7 +1,5 @@
 package com.microsoft.codepush.react;
 
-import android.content.Context;
-
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
@@ -21,39 +19,39 @@
 
 public class CodePushPackage {
 
-    public final String CODE_PUSH_FOLDER_PREFIX = "CodePush";
-    public final String CURRENT_PACKAGE_KEY = "currentPackage";
-    public final String DIFF_MANIFEST_FILE_NAME = "hotcodepush.json";
-    public final int DOWNLOAD_BUFFER_SIZE = 1024 * 256;
-    public final String DOWNLOAD_FILE_NAME = "download.zip";
-    public final String DOWNLOAD_URL_KEY = "downloadUrl";
-    public final String PACKAGE_FILE_NAME = "app.json";
-    public final String PACKAGE_HASH_KEY = "packageHash";
-    public final String PREVIOUS_PACKAGE_KEY = "previousPackage";
-    public final String RELATIVE_BUNDLE_PATH_KEY = "bundlePath";
-    public final String STATUS_FILE = "codepush.json";
-    public final String UNZIPPED_FOLDER_NAME = "unzipped";
-    public final String UPDATE_BUNDLE_FILE_NAME = "app.jsbundle";
+    private final String CODE_PUSH_FOLDER_PREFIX = "CodePush";
+    private final String CURRENT_PACKAGE_KEY = "currentPackage";
+    private final String DIFF_MANIFEST_FILE_NAME = "hotcodepush.json";
+    private final int DOWNLOAD_BUFFER_SIZE = 1024 * 256;
+    private final String DOWNLOAD_FILE_NAME = "download.zip";
+    private final String DOWNLOAD_URL_KEY = "downloadUrl";
+    private final String PACKAGE_FILE_NAME = "app.json";
+    private final String PACKAGE_HASH_KEY = "packageHash";
+    private final String PREVIOUS_PACKAGE_KEY = "previousPackage";
+    private final String RELATIVE_BUNDLE_PATH_KEY = "bundlePath";
+    private final String STATUS_FILE = "codepush.json";
+    private final String UNZIPPED_FOLDER_NAME = "unzipped";
+    private final String UPDATE_BUNDLE_FILE_NAME = "app.jsbundle";
 
     private String documentsDirectory;
 
     public CodePushPackage(String documentsDirectory) {
         this.documentsDirectory = documentsDirectory;
     }
 
-    public String getDownloadFilePath() {
+    private String getDownloadFilePath() {
         return CodePushUtils.appendPathComponent(getCodePushPath(), DOWNLOAD_FILE_NAME);
     }
 
-    public String getUnzippedFolderPath() {
+    private String getUnzippedFolderPath() {
         return CodePushUtils.appendPathComponent(getCodePushPath(), UNZIPPED_FOLDER_NAME);
     }
 
-    public String getDocumentsDirectory() {
+    private String getDocumentsDirectory() {
         return documentsDirectory;
     }
 
-    public String getCodePushPath() {
+    private String getCodePushPath() {
         String codePushPath = CodePushUtils.appendPathComponent(getDocumentsDirectory(), CODE_PUSH_FOLDER_PREFIX);
         if (CodePush.isUsingTestConfiguration()) {
             codePushPath = CodePushUtils.appendPathComponent(codePushPath, "TestPackages");
@@ -62,7 +60,7 @@ public String getCodePushPath() {
         return codePushPath;
     }
 
-    public String getStatusFilePath() {
+    private String getStatusFilePath() {
         return CodePushUtils.appendPathComponent(getCodePushPath(), STATUS_FILE);
     }
 
@@ -151,7 +149,7 @@ public WritableMap getPackage(String packageHash) {
         }
     }
 
-    public void downloadPackage(Context applicationContext, ReadableMap updatePackage, String expectedBundleFileName,
+    public void downloadPackage(ReadableMap updatePackage, String expectedBundleFileName,
                                 DownloadProgressCallback progressCallback) throws IOException {
         String newUpdateHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
         String newUpdateFolderPath = getPackageFolderPath(newUpdateHash);
@@ -163,7 +161,6 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
         }
 
         String downloadUrlString = CodePushUtils.tryGetString(updatePackage, DOWNLOAD_URL_KEY);
-        URL downloadUrl = null;
         HttpURLConnection connection = null;
         BufferedInputStream bin = null;
         FileOutputStream fos = null;
@@ -173,7 +170,7 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
 
         // Download the file while checking if it is a zip and notifying client of progress.
         try {
-            downloadUrl = new URL(downloadUrlString);
+            URL downloadUrl = new URL(downloadUrlString);
             connection = (HttpURLConnection) (downloadUrl.openConnection());
 
             long totalBytes = connection.getContentLength();
@@ -206,7 +203,10 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
                 progressCallback.call(new DownloadProgress(totalBytes, receivedBytes));
             }
 
-            assert totalBytes == receivedBytes;
+            if (totalBytes != receivedBytes) {
+                throw new CodePushUnknownException("Received " + receivedBytes + " bytes, expected " + totalBytes);
+            }
+
             isZip = ByteBuffer.wrap(header).getInt() == 0x504b0304;
         } catch (MalformedURLException e) {
             throw new CodePushMalformedDataException(downloadUrlString, e);
@@ -266,7 +266,7 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
                             " in update package.", e);
                 }
 
-                updatePackage = CodePushUtils.convertJsonObjectToWriteable(updatePackageJSON);
+                updatePackage = CodePushUtils.convertJsonObjectToWritable(updatePackageJSON);
             }
         } else {
             // File is a jsbundle, move it to a folder with the packageHash as its name
@@ -277,7 +277,7 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
         CodePushUtils.writeReadableMapToFile(updatePackage, newUpdateMetadataPath);
     }
 
-    public void installPackage(ReadableMap updatePackage, boolean removePendingUpdate) throws IOException {
+    public void installPackage(ReadableMap updatePackage, boolean removePendingUpdate) {
         String packageHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
         WritableMap info = getCurrentPackageInfo();
         if (removePendingUpdate) {

android/app/src/main/java/com/microsoft/codepush/react/CodePushPackage.java

@@ -1,6 +1,6 @@
 package com.microsoft.codepush.react;
 
-public class CodePushUnknownException extends RuntimeException {
+class CodePushUnknownException extends RuntimeException {
 
     public CodePushUnknownException(String message, Throwable cause) {
         super(message, cause);

android/app/src/main/java/com/microsoft/codepush/react/CodePushUnknownException.java

@@ -115,7 +115,7 @@ public static String getHashForBinaryContents(Activity mainActivity, boolean isD
     }
 
     public static void verifyHashForDiffUpdate(String folderPath, String expectedHash) {
-        ArrayList<String> updateContentsManifest = new ArrayList<String>();
+        ArrayList<String> updateContentsManifest = new ArrayList<>();
         addContentsOfFolderToManifest(folderPath, "", updateContentsManifest);
         Collections.sort(updateContentsManifest);
         JSONArray updateContentsJSONArray = new JSONArray();

android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java

@@ -15,29 +15,22 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.PrintWriter;
 import java.util.Iterator;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 public class CodePushUtils {
 
-    public static final String CODE_PUSH_TAG = "CodePush";
     public static final String REACT_NATIVE_LOG_TAG = "ReactNative";
 
     public static String appendPathComponent(String basePath, String appendPathComponent) {
         return new File(basePath, appendPathComponent).getAbsolutePath();
     }
 
-    public static WritableArray convertJsonArrayToWriteable(JSONArray jsonArr) {
+    public static WritableArray convertJsonArrayToWritable(JSONArray jsonArr) {
         WritableArray arr = Arguments.createArray();
         for (int i=0; i<jsonArr.length(); i++) {
             Object obj = null;
@@ -49,9 +42,9 @@ public static WritableArray convertJsonArrayToWriteable(JSONArray jsonArr) {
             }
 
             if (obj instanceof JSONObject)
-                arr.pushMap(convertJsonObjectToWriteable((JSONObject) obj));
+                arr.pushMap(convertJsonObjectToWritable((JSONObject) obj));
             else if (obj instanceof JSONArray)
-                arr.pushArray(convertJsonArrayToWriteable((JSONArray) obj));
+                arr.pushArray(convertJsonArrayToWritable((JSONArray) obj));
             else if (obj instanceof String)
                 arr.pushString((String) obj);
             else if (obj instanceof Double)
@@ -69,7 +62,7 @@ else if (obj == null)
         return arr;
     }
 
-    public static WritableMap convertJsonObjectToWriteable(JSONObject jsonObj) {
+    public static WritableMap convertJsonObjectToWritable(JSONObject jsonObj) {
         WritableMap map = Arguments.createMap();
         Iterator<String> it = jsonObj.keys();
         while(it.hasNext()){
@@ -83,9 +76,9 @@ public static WritableMap convertJsonObjectToWriteable(JSONObject jsonObj) {
             }
 
             if (obj instanceof JSONObject)
-                map.putMap(key, convertJsonObjectToWriteable((JSONObject) obj));
+                map.putMap(key, convertJsonObjectToWritable((JSONObject) obj));
             else if (obj instanceof JSONArray)
-                map.putArray(key, convertJsonArrayToWriteable((JSONArray) obj));
+                map.putArray(key, convertJsonArrayToWritable((JSONArray) obj));
             else if (obj instanceof String)
                 map.putString(key, (String) obj);
             else if (obj instanceof Double)
@@ -105,7 +98,7 @@ else if (obj == null)
 
     public static WritableMap convertReadableMapToWritableMap(ReadableMap map) {
         JSONObject mapJSON = convertReadableToJsonObject(map);
-        return convertJsonObjectToWriteable(mapJSON);
+        return convertJsonObjectToWritable(mapJSON);
     }
 
     public static JSONArray convertReadableToJsonArray(ReadableArray arr) {
@@ -204,16 +197,13 @@ public static String getStringFromInputStream(InputStream inputStream) throws IO
     }
 
     public static WritableMap getWritableMapFromFile(String filePath) throws IOException {
-
         String content = FileUtils.readFileToString(filePath);
-        JSONObject json = null;
         try {
-            json = new JSONObject(content);
-            return convertJsonObjectToWriteable(json);
+            JSONObject json = new JSONObject(content);
+            return convertJsonObjectToWritable(json);
         } catch (JSONException jsonException) {
             throw new CodePushMalformedDataException(filePath, jsonException);
         }
-
     }
 
     public static void log(String message) {

android/app/src/main/java/com/microsoft/codepush/react/CodePushUtils.java

@@ -3,9 +3,9 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 
-public class DownloadProgress {
-    public long totalBytes;
-    public long receivedBytes;
+class DownloadProgress {
+    private long totalBytes;
+    private long receivedBytes;
 
     public DownloadProgress (long totalBytes, long receivedBytes){
         this.totalBytes = totalBytes;

android/app/src/main/java/com/microsoft/codepush/react/DownloadProgress.java

@@ -1,5 +1,5 @@
 package com.microsoft.codepush.react;
 
-public interface DownloadProgressCallback {
+interface DownloadProgressCallback {
     void call(DownloadProgress downloadProgress);
 }

android/app/src/main/java/com/microsoft/codepush/react/DownloadProgressCallback.java

@@ -9,12 +9,11 @@
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
 public class FileUtils {
 
-    public static final int WRITE_BUFFER_SIZE = 1024 * 8;
+    private static final int WRITE_BUFFER_SIZE = 1024 * 8;
 
     public static void copyDirectoryContents(String sourceDirectoryPath, String destinationDirectoryPath) throws IOException {
         File sourceDir = new File(sourceDirectoryPath);
@@ -55,21 +54,16 @@ public static void copyDirectoryContents(String sourceDirectoryPath, String dest
         }
     }
 
-    public static boolean createFolderAtPath(String filePath) {
-        File file = new File(filePath);
-        return file.mkdir();
-    }
-
     public static void deleteDirectory(File directory) {
         if (directory.exists()) {
             File[] files = directory.listFiles();
             if (files != null) {
-                for (int i=0; i<files.length; i++) {
-                    if(files[i].isDirectory()) {
-                        deleteDirectory(files[i]);
+                for (File file : files) {
+                    if(file.isDirectory()) {
+                        deleteDirectory(file);
                     }
                     else {
-                        files[i].delete();
+                        file.delete();
                     }
                 }
             }
@@ -88,12 +82,12 @@ public static void deleteFileAtPathSilently(String path) {
     public static void deleteFileOrFolderSilently(File file) {
         if (file.isDirectory()) {
             File[] files = file.listFiles();
-            for (int i = 0; i < files.length; i++) {
-                if (files[i].isDirectory()) {
-                    deleteFileOrFolderSilently(files[i]);
+            for (File fileEntry : files) {
+                if (fileEntry.isDirectory()) {
+                    deleteFileOrFolderSilently(fileEntry);
                 } else {
                     if (!file.delete()) {
-                        files[i].delete();
+                        fileEntry.delete();
                     }
                 }
             }