[Android] Fix intent empty when package/class is passed from JS

Author: Adelmo Freitas

cordova-plugin-nativeview.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
  #
 
  s.name = "cordova-plugin-nativeview"
- s.version = "1.0.2"
+ s.version = "1.0.5"
  s.summary = "Start or Back to a native screen/page from app or other app"
 
  # This description is used to generate tags and improve search results.

package.json

@@ -1,6 +1,6 @@
 {
  "name": "cordova-plugin-nativeview",
- "version": "1.0.2",
+ "version": "1.0.5",
  "types": "./types/index.d.ts",
  "description": "Start or Back to a native screen/page",
  "author": {

plugin.xml

@@ -2,7 +2,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
  id="cordova-plugin-nativeview"
- version="1.0.2">
+ version="1.0.5">
  <name>Cordova NativeView Plugin</name>
  <description>
  Start or Back to a UIViewController(ios)/Activity(Android) 

src/android/br/com/mfdeveloper/cordova/NativeView.java

@@ -280,7 +280,7 @@ protected Intent configureIntent(JSONArray args, JSONObject activityParams, Call
  intent.setPackage(targetPackage);
  }
 
- intentFromClass(intent, activityParams, callbackContext);
+ intent = intentFromClass(intent, activityParams, callbackContext);
 
  intent = intentFromComponent(intent, activityParams, callbackContext);
  }
@@ -342,33 +342,27 @@ protected Intent intentFromUri(Intent intent, JSONObject activityParams, Callbac
 
  protected Intent intentFromClass(Intent intent, JSONObject activityParams, CallbackContext callbackContext) throws JSONException {
 
- if (activityParams.has("className")) {
+ if (activityParams.has("className") && activityParams.has("packageName")) {
 
- Activity activity = null;
-
- if (!activityParams.has("packageName")
- || activityParams.getString("packageName").contains(cordova.getActivity().getPackageName())) {
- activity = cordova.getActivity();
- }
-
- if(activity != null) {
- try {
+ try {
 
- Class<?> activityClass = Class.forName(activityParams.getString("packageName") + "." + activityParams.getString("className"));
- intent = new Intent(activity, activityClass);
- intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ intent = new Intent(activityParams.optString("packageName") + "." + activityParams.getString("className"));
+ intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
-  }catch (Exception clsErr) {
-  JSONObject error = errorResult(clsErr);
+ }catch (Exception clsErr) {
+ JSONObject error = errorResult(clsErr);
 
- callbackContext.error(error);
- clsErr.printStackTrace();
- }
- }else{
- ComponentName component = new ComponentName(activityParams.getString("packageName"), activityParams.getString("className"));
- intent = new Intent().setComponent(component);
+ callbackContext.error(error);
+ clsErr.printStackTrace();
  }
+ }else{
+ JSONObject error = new JSONObject();
+ error.put("message", "The params 'packageName' and 'className' is required");
+ error.put("sucess", false);
+
+ callbackContext.error(error);
  }
+
  return intent;
  }