Skip to content

Commit

Permalink
Issue MobileChromeApps#64: Plugin uses Android Log class and not Cord…
Browse files Browse the repository at this point in the history
…ova LOG class
  • Loading branch information
macdonst committed Aug 23, 2016
1 parent 977b57d commit 10e8df8
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions src/android/Zip.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;


import android.net.Uri;
import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.CordovaResourceApi.OpenForReadResult;
import org.apache.cordova.LOG;
import org.apache.cordova.PluginResult;
import org.json.JSONException;
import org.json.JSONObject;

import android.util.Log;

public class Zip extends CordovaPlugin {

private static final String LOG_TAG = "Zip";
Expand Down Expand Up @@ -67,7 +65,7 @@ private void unzipSync(CordovaArgs args, CallbackContext callbackContext) {
if (tempFile == null || !tempFile.exists()) {
String errorMessage = "Zip file does not exist";
callbackContext.error(errorMessage);
Log.e(LOG_TAG, errorMessage);
LOG.e(LOG_TAG, errorMessage);
return;
}

Expand All @@ -77,7 +75,7 @@ private void unzipSync(CordovaArgs args, CallbackContext callbackContext) {
if (outputDir == null || (!outputDir.exists() && !outputDir.mkdirs())){
String errorMessage = "Could not create output directory";
callbackContext.error(errorMessage);
Log.e(LOG_TAG, errorMessage);
LOG.e(LOG_TAG, errorMessage);
return;
}

Expand Down Expand Up @@ -128,7 +126,7 @@ private void unzipSync(CordovaArgs args, CallbackContext callbackContext) {
File file = new File(outputDirectory + compressedName);
file.getParentFile().mkdirs();
if(file.exists() || file.createNewFile()){
Log.w("Zip", "extracting: " + file.getPath());
LOG.w(LOG_TAG, "extracting: " + file.getPath());
FileOutputStream fout = new FileOutputStream(file);
int count;
while ((count = zis.read(buffer)) != -1)
Expand All @@ -155,7 +153,7 @@ private void unzipSync(CordovaArgs args, CallbackContext callbackContext) {
} catch (Exception e) {
String errorMessage = "An error occurred while unzipping.";
callbackContext.error(errorMessage);
Log.e(LOG_TAG, errorMessage, e);
LOG.e(LOG_TAG, errorMessage, e);
} finally {
if (inputStream != null) {
try {
Expand Down

0 comments on commit 10e8df8

Please sign in to comment.