Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
Changes for crodova 3.0
Browse files Browse the repository at this point in the history 
Updates based mostly on:
http://simonmacdonald.blogspot.fr/2013/06/why-dont-my-plugins-work-in-phonegap.html
  • Loading branch information
@Eccenux
Eccenux committed Jul 24, 2013
1 parent e728d33 commit c84bf0e
Showing 1 changed file with 55 additions and 38 deletions.
93 changes: 55 additions & 38 deletions src/android/com/phonegap/plugins/barcodescanner/BarcodeScanner.java
View file
Expand Up @@ -4,8 +4,8 @@
*
* Copyright (c) Matt Kane 2010
* Copyright (c) 2011, IBM Corporation
* Copyright (c) 2013, Maciej Nux Jaros
*/

package com.phonegap.plugins.barcodescanner;

import org.json.JSONArray;
Expand All @@ -16,13 +16,18 @@
import android.content.Intent;
import android.util.Log;

import org.apache.cordova.api.Plugin;
import org.apache.cordova.api.PluginResult;
import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.CallbackContext;
import org.apache.cordova.PluginResult;

/**
* This calls out to the ZXing barcode reader and returns the result.
*
* @sa https://github.com/apache/cordova-android/blob/master/framework/src/org/apache/cordova/CordovaPlugin.java
*/
public class BarcodeScanner extends Plugin {
public class BarcodeScanner extends CordovaPlugin {
public static final int REQUEST_CODE = 0x0ba7c0de;

private static final String SCAN = "scan";
private static final String ENCODE = "encode";
private static final String CANCELLED = "cancelled";
Expand All @@ -39,9 +44,9 @@ public class BarcodeScanner extends Plugin {
private static final String PHONE_TYPE = "PHONE_TYPE";
private static final String SMS_TYPE = "SMS_TYPE";

public static final int REQUEST_CODE = 0x0ba7c0de;
private static final String LOG_TAG = "BarcodeScanner";

public String callback;
private CallbackContext callbackContext;

/**
* Constructor.
Expand All @@ -50,15 +55,24 @@ public BarcodeScanner() {
}

/**
* Executes the request and returns PluginResult.
* Executes the request.
*
* This method is called from the WebView thread. To do a non-trivial amount of work, use:
* cordova.getThreadPool().execute(runnable);
*
* @param action The action to execute.
* @param args JSONArray of arguments for the plugin.
* @param callbackId The callback id used when calling back into JavaScript.
* @return A PluginResult object with a status and message.
* To run on the UI thread, use:
* cordova.getActivity().runOnUiThread(runnable);
*
* @param action The action to execute.
* @param args The exec() arguments.
* @param callbackContext The callback context used when calling back into JavaScript.
* @return Whether the action was valid.
*
* @sa https://github.com/apache/cordova-android/blob/master/framework/src/org/apache/cordova/CordovaPlugin.java
*/
public PluginResult execute(String action, JSONArray args, String callbackId) {
this.callback = callbackId;
@Override
public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
this.callbackContext = callbackContext;

if (action.equals(ENCODE)) {
JSONObject obj = args.optJSONObject(0);
Expand All @@ -72,43 +86,42 @@ public PluginResult execute(String action, JSONArray args, String callbackId) {
}

if (data == null) {
return new PluginResult(PluginResult.Status.ERROR, "User did not specify data to encode");
callbackContext.error("User did not specify data to encode");
return true;
}

encode(type, data);
} else {
return new PluginResult(PluginResult.Status.ERROR, "User did not specify data to encode");
callbackContext.error("User did not specify data to encode");
return true;
}
}
else if (action.equals(SCAN)) {
} else if (action.equals(SCAN)) {
scan();
} else {
return new PluginResult(PluginResult.Status.INVALID_ACTION);
return false;
}
PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
r.setKeepCallback(true);
return r;
return true;
}


/**
* Starts an intent to scan and decode a barcode.
*/
public void scan() {
Intent intentScan = new Intent(SCAN_INTENT);
intentScan.addCategory(Intent.CATEGORY_DEFAULT);

this.cordova.startActivityForResult((Plugin) this, intentScan, REQUEST_CODE);
this.cordova.startActivityForResult((CordovaPlugin) this, intentScan, REQUEST_CODE);
}

/**
* Called when the barcode scanner intent completes
* Called when the barcode scanner intent completes.
*
* @param requestCode The request code originally supplied to startActivityForResult(),
* allowing you to identify who this result came from.
* @param resultCode The integer result code returned by the child activity through its setResult().
* @param intent An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
* @param requestCode The request code originally supplied to startActivityForResult(),
* allowing you to identify who this result came from.
* @param resultCode The integer result code returned by the child activity through its setResult().
* @param intent An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
*/
@Override
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
if (requestCode == REQUEST_CODE) {
if (resultCode == Activity.RESULT_OK) {
Expand All @@ -117,30 +130,34 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
obj.put(TEXT, intent.getStringExtra("SCAN_RESULT"));
obj.put(FORMAT, intent.getStringExtra("SCAN_RESULT_FORMAT"));
obj.put(CANCELLED, false);
} catch(JSONException e) {
//Log.d(LOG_TAG, "This should never happen");
} catch (JSONException e) {
Log.d(LOG_TAG, "This should never happen");
}
this.success(new PluginResult(PluginResult.Status.OK, obj), this.callback);
//this.success(new PluginResult(PluginResult.Status.OK, obj), this.callback);
this.callbackContext.success(obj);
} else if (resultCode == Activity.RESULT_CANCELED) {
JSONObject obj = new JSONObject();
try {
obj.put(TEXT, "");
obj.put(FORMAT, "");
obj.put(CANCELLED, true);
} catch(JSONException e) {
//Log.d(LOG_TAG, "This should never happen");
} catch (JSONException e) {
Log.d(LOG_TAG, "This should never happen");
}
this.success(new PluginResult(PluginResult.Status.OK, obj), this.callback);
//this.success(new PluginResult(PluginResult.Status.OK, obj), this.callback);
this.callbackContext.success(obj);
} else {
this.error(new PluginResult(PluginResult.Status.ERROR), this.callback);
//this.error(new PluginResult(PluginResult.Status.ERROR), this.callback);
this.callbackContext.error("Unexpected error");
}
}
}

/**
* Initiates a barcode encode.
* @param data The data to encode in the bar code
* @param data2
*
* @param type Endoiding type.
* @param data The data to encode in the bar code.
*/
public void encode(String type, String data) {
Intent intentEncode = new Intent(ENCODE_INTENT);
Expand All @@ -149,4 +166,4 @@ public void encode(String type, String data) {

this.cordova.getActivity().startActivity(intentEncode);
}
}
}

0 comments on commit c84bf0e

Please sign in to comment.