Skip to content

Fix for Parcable Extra with Array and Uri #7

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

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

Fix for Parcable Extra with Array and Uri #7

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
50 changes: 43 additions & 7 deletions src/android/WebIntent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.HashMap;
import java.util.Map;
import java.util.ArrayList;

import org.apache.cordova.CordovaActivity;
import org.json.JSONArray;
Expand All @@ -12,6 +13,7 @@
import android.content.Intent;
import android.net.Uri;
import android.text.Html;
import android.util.Log;

import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.PluginResult;
Expand All @@ -29,6 +31,7 @@
public class WebIntent extends CordovaPlugin {

private CallbackContext onNewIntentCallback = null;
private Intent newestIntent;

/**
* Executes the request and returns PluginResult.
Expand Down Expand Up @@ -89,7 +92,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
callbackContext.sendPluginResult(res);
return false;
}
Intent i = ((CordovaActivity) this.cordova.getActivity()).getIntent();
Intent i = getIntent();
String extraName = args.getString(0);
PluginResult res = new PluginResult(PluginResult.Status.OK, i.hasExtra(extraName));
callbackContext.sendPluginResult(res);
Expand All @@ -101,15 +104,39 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
callbackContext.sendPluginResult(res);
return false;
}
Intent i = ((CordovaActivity) this.cordova.getActivity()).getIntent();
Intent i = getIntent();
String extraName = args.getString(0);

if (i.hasExtra(extraName)) {
PluginResult res = new PluginResult(PluginResult.Status.OK, i.hasExtra(extraName));
callbackContext.sendPluginResult(res);
return true;
String r = i.getStringExtra(extraName);
if (null == r) {
Uri uri = ((Uri) i.getParcelableExtra(extraName));

if(uri != null) {
r = uri.toString();
}

Log.d("CORDOVA", "GetExtra");

if(null == r) {
ArrayList<Uri> list = i.getParcelableArrayListExtra(extraName);

JSONArray arr = new JSONArray();
for(Uri u : list) {
arr.put(u.toString());
}

callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, arr));
return true;
}
}

callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, r));
return true;
} else {

Log.d("CORDOVA", "Does not have extra.");

PluginResult res = new PluginResult(PluginResult.Status.ERROR);
callbackContext.sendPluginResult(res);
return false;
Expand All @@ -122,7 +149,7 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
return false;
}

Intent i = ((CordovaActivity) this.cordova.getActivity()).getIntent();
Intent i = getIntent();
String uri = i.getDataString();

callbackContext.success(uri);
Expand Down Expand Up @@ -183,11 +210,20 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo

@Override
public void onNewIntent(Intent intent) {
this.newestIntent = intent;
if (this.onNewIntentCallback != null) {
this.onNewIntentCallback.success(intent.getDataString());
}
}

Intent getIntent() {
if(this.newestIntent != null) {
return this.newestIntent;
}

return ((CordovaActivity) this.cordova.getActivity()).getIntent();
}

void startActivity(String action, Uri uri, String type, Map<String, String> extras, Map<String, String> handlerMap) {
Intent i = (uri != null ? new Intent(action, uri) : new Intent(action));

Expand Down Expand Up @@ -232,4 +268,4 @@ void sendBroadcast(String action, Map<String, String> extras) {

((CordovaActivity) this.cordova.getActivity()).sendBroadcast(intent);
}
}
}