Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #64: Plugin uses Android Log class and not Cordova LOG class #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #64: Plugin uses Android Log class and not Cordova LOG class #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/android/Zip.java
View file
Open in desktop
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