Limit functionality of the plugin to hasExtra and getExtra.
This commit is contained in:
parent
3a1dc45f56
commit
0d7b584a5a
|
|
@ -1,5 +1,5 @@
|
|||
# WebIntent Android Plugin for Cordova 3.X #
|
||||
By Boris Smus
|
||||
# Simplified WebIntent Android Plugin for Cordova 3.X #
|
||||
By Boris Smus, modified by Achim D. Brucker and Michael Herzberg
|
||||
|
||||
Phonegap/Cordova 2.X version available at the [WebIntent](https://github.com/phonegap/phonegap-plugins/tree/master/Android/WebIntent) plugin site.
|
||||
|
||||
|
|
@ -32,18 +32,6 @@ Here is an example of using webintent to open an Android .apk package, which the
|
|||
## Using the plugin ##
|
||||
The plugin creates the object `window.plugins.webintent` with five methods:
|
||||
|
||||
### startActivity ###
|
||||
Launches an Android intent. For example:
|
||||
|
||||
|
||||
window.plugins.webintent.startActivity({
|
||||
action: window.plugins.webintent.ACTION_VIEW,
|
||||
url: 'geo:0,0?q=' + address},
|
||||
function() {},
|
||||
function() {alert('Failed to open URL via Android Intent')};
|
||||
);
|
||||
|
||||
|
||||
### hasExtra ###
|
||||
checks if this app was invoked with the specified extra. For example:
|
||||
|
||||
|
|
@ -66,36 +54,6 @@ Gets the extra that this app was invoked with. For example:
|
|||
}
|
||||
);
|
||||
|
||||
### getUri ###
|
||||
Gets the Uri the app was invoked with. For example:
|
||||
|
||||
window.plugins.webintent.getUri(function(url) {
|
||||
if(url !== "") {
|
||||
// url is the url the intent was launched with
|
||||
}
|
||||
});
|
||||
|
||||
### onNewIntent ###
|
||||
Gets called when onNewIntent is called for the parent activity. Used in only certain launchModes. For example:
|
||||
|
||||
window.plugins.webintent.onNewIntent(function(url) {
|
||||
if(url !== "") {
|
||||
// url is the url that was passed to onNewIntent
|
||||
}
|
||||
});
|
||||
|
||||
### sendBroadcast ###
|
||||
Sends a custom intent passing optional extras
|
||||
|
||||
window.plugins.webintent.sendBroadcast({
|
||||
action: 'com.dummybroadcast.action.triggerthing',
|
||||
extras: {
|
||||
'option': true
|
||||
}
|
||||
}, function() {
|
||||
}, function() {
|
||||
});
|
||||
|
||||
## Licence ##
|
||||
|
||||
The MIT License
|
||||
|
|
|
|||
|
|
@ -18,12 +18,11 @@ import org.apache.cordova.CordovaResourceApi;
|
|||
import org.apache.cordova.PluginResult;
|
||||
|
||||
/**
|
||||
* WebIntent is a PhoneGap plugin that bridges Android intents and web
|
||||
* applications:
|
||||
* WebIntent is a PhoneGap plugin that bridges Android intents and web applications:
|
||||
*
|
||||
* 1. web apps can spawn intents that call native Android applications. 2.
|
||||
* (after setting up correct intent filters for PhoneGap applications), Android
|
||||
* intents can be handled by PhoneGap web applications.
|
||||
* 1. web apps can spawn intents that call native Android applications. 2. (after setting up correct
|
||||
* intent filters for PhoneGap applications), Android intents can be handled by PhoneGap web
|
||||
* applications.
|
||||
*
|
||||
* @author boris@borismus.com
|
||||
*
|
||||
|
|
@ -32,186 +31,67 @@ public class WebIntent extends CordovaPlugin {
|
|||
|
||||
private CallbackContext onNewIntentCallbackContext = null;
|
||||
|
||||
//public boolean execute(String action, JSONArray args, String callbackId) {
|
||||
// public boolean execute(String action, JSONArray args, String callbackId) {
|
||||
@Override
|
||||
public boolean execute(String action, JSONArray args, CallbackContext callbackContext) {
|
||||
try {
|
||||
|
||||
if (action.equals("startActivity")) {
|
||||
if (args.length() != 1) {
|
||||
//return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Parse the arguments
|
||||
final CordovaResourceApi resourceApi = webView.getResourceApi();
|
||||
JSONObject obj = args.getJSONObject(0);
|
||||
String type = obj.has("type") ? obj.getString("type") : null;
|
||||
Uri uri = obj.has("url") ? resourceApi.remapUri(Uri.parse(obj.getString("url"))) : null;
|
||||
JSONObject extras = obj.has("extras") ? obj.getJSONObject("extras") : null;
|
||||
Map<String, String> extrasMap = new HashMap<String, String>();
|
||||
|
||||
// Populate the extras if any exist
|
||||
if (extras != null) {
|
||||
JSONArray extraNames = extras.names();
|
||||
for (int i = 0; i < extraNames.length(); i++) {
|
||||
String key = extraNames.getString(i);
|
||||
String value = extras.getString(key);
|
||||
extrasMap.put(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
startActivity(obj.getString("action"), uri, type, extrasMap);
|
||||
//return new PluginResult(PluginResult.Status.OK);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK));
|
||||
return true;
|
||||
|
||||
} else if (action.equals("hasExtra")) {
|
||||
if (args.length() != 1) {
|
||||
//return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
Intent i = ((CordovaActivity)this.cordova.getActivity()).getIntent();
|
||||
String extraName = args.getString(0);
|
||||
//return new PluginResult(PluginResult.Status.OK, i.hasExtra(extraName));
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, i.hasExtra(extraName)));
|
||||
return true;
|
||||
|
||||
if (action.equals("hasExtra")) {
|
||||
return hasExtra(args, callbackContext);
|
||||
} else if (action.equals("getExtra")) {
|
||||
if (args.length() != 1) {
|
||||
//return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
Intent i = ((CordovaActivity)this.cordova.getActivity()).getIntent();
|
||||
String extraName = args.getString(0);
|
||||
if (i.hasExtra(extraName)) {
|
||||
//return new PluginResult(PluginResult.Status.OK, i.getStringExtra(extraName));
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, i.getStringExtra(extraName)));
|
||||
return true;
|
||||
} else {
|
||||
//return new PluginResult(PluginResult.Status.ERROR);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.ERROR));
|
||||
return false;
|
||||
}
|
||||
} else if (action.equals("getUri")) {
|
||||
if (args.length() != 0) {
|
||||
//return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
|
||||
Intent i = ((CordovaActivity)this.cordova.getActivity()).getIntent();
|
||||
String uri = i.getDataString();
|
||||
//return new PluginResult(PluginResult.Status.OK, uri);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, uri));
|
||||
return true;
|
||||
} else if (action.equals("onNewIntent")) {
|
||||
//save reference to the callback; will be called on "new intent" events
|
||||
this.onNewIntentCallbackContext = callbackContext;
|
||||
|
||||
if (args.length() != 0) {
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
|
||||
PluginResult result = new PluginResult(PluginResult.Status.NO_RESULT);
|
||||
result.setKeepCallback(true); //re-use the callback on intent events
|
||||
callbackContext.sendPluginResult(result);
|
||||
return true;
|
||||
//return result;
|
||||
} else if (action.equals("sendBroadcast"))
|
||||
{
|
||||
if (args.length() != 1) {
|
||||
//return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
|
||||
// Parse the arguments
|
||||
JSONObject obj = args.getJSONObject(0);
|
||||
|
||||
JSONObject extras = obj.has("extras") ? obj.getJSONObject("extras") : null;
|
||||
Map<String, String> extrasMap = new HashMap<String, String>();
|
||||
|
||||
// Populate the extras if any exist
|
||||
if (extras != null) {
|
||||
JSONArray extraNames = extras.names();
|
||||
for (int i = 0; i < extraNames.length(); i++) {
|
||||
String key = extraNames.getString(i);
|
||||
String value = extras.getString(key);
|
||||
extrasMap.put(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
sendBroadcast(obj.getString("action"), extrasMap);
|
||||
//return new PluginResult(PluginResult.Status.OK);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK));
|
||||
return true;
|
||||
return getExtra(args, callbackContext);
|
||||
}
|
||||
//return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
// return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
} catch (JSONException e) {
|
||||
e.printStackTrace();
|
||||
String errorMessage=e.getMessage();
|
||||
//return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION,errorMessage));
|
||||
String errorMessage = e.getMessage();
|
||||
// return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION, errorMessage));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
boolean hasExtra(JSONArray args, CallbackContext callbackContext) throws JSONException {
|
||||
if (args.length() != 1) {
|
||||
// return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
Intent i = ((CordovaActivity) this.cordova.getActivity()).getIntent();
|
||||
String extraName = args.getString(0);
|
||||
// return new PluginResult(PluginResult.Status.OK, i.hasExtra(extraName));
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, i.hasExtra(extraName)));
|
||||
return true;
|
||||
}
|
||||
|
||||
boolean getExtra(JSONArray args, CallbackContext callbackContext) throws JSONException {
|
||||
if (args.length() != 1) {
|
||||
// return new PluginResult(PluginResult.Status.INVALID_ACTION);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.INVALID_ACTION));
|
||||
return false;
|
||||
}
|
||||
Intent i = ((CordovaActivity) this.cordova.getActivity()).getIntent();
|
||||
String extraName = args.getString(0);
|
||||
if (i.hasExtra(extraName)) {
|
||||
// return new PluginResult(PluginResult.Status.OK, i.getStringExtra(extraName));
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, i.getStringExtra(extraName)));
|
||||
return true;
|
||||
} else {
|
||||
// return new PluginResult(PluginResult.Status.ERROR);
|
||||
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.ERROR));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNewIntent(Intent intent) {
|
||||
|
||||
|
||||
if (this.onNewIntentCallbackContext != null) {
|
||||
PluginResult result = new PluginResult(PluginResult.Status.OK, intent.getDataString());
|
||||
result.setKeepCallback(true);
|
||||
PluginResult result = new PluginResult(PluginResult.Status.OK, intent.getDataString());
|
||||
result.setKeepCallback(true);
|
||||
this.onNewIntentCallbackContext.sendPluginResult(result);
|
||||
}
|
||||
}
|
||||
|
||||
void startActivity(String action, Uri uri, String type, Map<String, String> extras) {
|
||||
Intent i = (uri != null ? new Intent(action, uri) : new Intent(action));
|
||||
|
||||
if (type != null && uri != null) {
|
||||
i.setDataAndType(uri, type); //Fix the crash problem with android 2.3.6
|
||||
} else {
|
||||
if (type != null) {
|
||||
i.setType(type);
|
||||
}
|
||||
}
|
||||
|
||||
for (String key : extras.keySet()) {
|
||||
String value = extras.get(key);
|
||||
// If type is text html, the extra text must sent as HTML
|
||||
if (key.equals(Intent.EXTRA_TEXT) && type.equals("text/html")) {
|
||||
i.putExtra(key, Html.fromHtml(value));
|
||||
} else if (key.equals(Intent.EXTRA_STREAM)) {
|
||||
// allowes sharing of images as attachments.
|
||||
// value in this case should be a URI of a file
|
||||
final CordovaResourceApi resourceApi = webView.getResourceApi();
|
||||
i.putExtra(key, resourceApi.remapUri(Uri.parse(value)));
|
||||
} else if (key.equals(Intent.EXTRA_EMAIL)) {
|
||||
// allows to add the email address of the receiver
|
||||
i.putExtra(Intent.EXTRA_EMAIL, new String[] { value });
|
||||
} else {
|
||||
i.putExtra(key, value);
|
||||
}
|
||||
}
|
||||
((CordovaActivity)this.cordova.getActivity()).startActivity(i);
|
||||
}
|
||||
|
||||
void sendBroadcast(String action, Map<String, String> extras) {
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(action);
|
||||
for (String key : extras.keySet()) {
|
||||
String value = extras.get(key);
|
||||
intent.putExtra(key, value);
|
||||
}
|
||||
|
||||
((CordovaActivity)this.cordova.getActivity()).sendBroadcast(intent);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (c) Boris Smus 2010
|
||||
*
|
||||
*/
|
||||
(function(cordova){
|
||||
(function(cordova) {
|
||||
var WebIntent = function() {
|
||||
|
||||
};
|
||||
|
|
@ -17,14 +17,6 @@
|
|||
WebIntent.prototype.ACTION_CALL = "android.intent.action.CALL";
|
||||
WebIntent.prototype.ACTION_SENDTO = "android.intent.action.SENDTO";
|
||||
|
||||
WebIntent.prototype.startActivity = function(params, success, fail) {
|
||||
return cordova.exec(function(args) {
|
||||
success(args);
|
||||
}, function(args) {
|
||||
fail(args);
|
||||
}, 'WebIntent', 'startActivity', [params]);
|
||||
};
|
||||
|
||||
WebIntent.prototype.hasExtra = function(params, success, fail) {
|
||||
return cordova.exec(function(args) {
|
||||
success(args);
|
||||
|
|
@ -33,14 +25,6 @@
|
|||
}, 'WebIntent', 'hasExtra', [params]);
|
||||
};
|
||||
|
||||
WebIntent.prototype.getUri = function(success, fail) {
|
||||
return cordova.exec(function(args) {
|
||||
success(args);
|
||||
}, function(args) {
|
||||
fail(args);
|
||||
}, 'WebIntent', 'getUri', []);
|
||||
};
|
||||
|
||||
WebIntent.prototype.getExtra = function(params, success, fail) {
|
||||
return cordova.exec(function(args) {
|
||||
success(args);
|
||||
|
|
@ -49,24 +33,8 @@
|
|||
}, 'WebIntent', 'getExtra', [params]);
|
||||
};
|
||||
|
||||
|
||||
WebIntent.prototype.onNewIntent = function(callback) {
|
||||
return cordova.exec(function(args) {
|
||||
callback(args);
|
||||
}, function(args) {
|
||||
}, 'WebIntent', 'onNewIntent', []);
|
||||
};
|
||||
|
||||
WebIntent.prototype.sendBroadcast = function(params, success, fail) {
|
||||
return cordova.exec(function(args) {
|
||||
success(args);
|
||||
}, function(args) {
|
||||
fail(args);
|
||||
}, 'WebIntent', 'sendBroadcast', [params]);
|
||||
};
|
||||
|
||||
window.webintent = new WebIntent();
|
||||
|
||||
|
||||
// backwards compatibility
|
||||
window.plugins = window.plugins || {};
|
||||
window.plugins.webintent = window.webintent;
|
||||
|
|
|
|||
Loading…
Reference in New Issue