public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

CB-8764 Store serviceName instead of class (close #169)

Browse Source
This commit is contained in:
Serge Huijben 2015-03-27 12:52:11 +01:00 committed by Andrew Grieve
parent 7cf7311a9d
commit 500ccd8e80
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/src/org/apache/cordova/CordovaInterfaceImpl.java
View File

@ -18,7 +18,7 @@ public class CordovaInterfaceImpl implements CordovaInterface {
protected PluginManager pluginManager; protected PluginManager pluginManager;
protected CordovaPlugin activityResultCallback; protected CordovaPlugin activityResultCallback;
protected String initCallbackClass; protected String initCallbackService;
protected int activityResultRequestCode; protected int activityResultRequestCode;
public CordovaInterfaceImpl(Activity activity) { public CordovaInterfaceImpl(Activity activity) {
@ -77,12 +77,12 @@ public class CordovaInterfaceImpl implements CordovaInterface {
*/ */
public boolean onActivityResult(int requestCode, int resultCode, Intent intent) { public boolean onActivityResult(int requestCode, int resultCode, Intent intent) {
CordovaPlugin callback = activityResultCallback; CordovaPlugin callback = activityResultCallback;
if(callback == null && initCallbackClass != null) { if(callback == null && initCallbackService != null) {
// The application was restarted, but had defined an initial callback // The application was restarted, but had defined an initial callback
// before being shut down. // before being shut down.
callback = pluginManager.getPlugin(initCallbackClass); callback = pluginManager.getPlugin(initCallbackService);
} }
initCallbackClass = null; initCallbackService = null;
activityResultCallback = null; activityResultCallback = null;
if (callback != null) { if (callback != null) {
@ -108,8 +108,8 @@ public class CordovaInterfaceImpl implements CordovaInterface {
*/ */
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
if (activityResultCallback != null) { if (activityResultCallback != null) {
String cClass = activityResultCallback.getClass().getName(); String serviceName = activityResultCallback.getServiceName();
outState.putString("callbackClass", cClass); outState.putString("callbackService", serviceName);
} }
} }
@ -117,6 +117,6 @@ public class CordovaInterfaceImpl implements CordovaInterface {
* Call this from onCreate() so that any saved startActivityForResult parameters will be restored. * Call this from onCreate() so that any saved startActivityForResult parameters will be restored.
*/ */
public void restoreInstanceState(Bundle savedInstanceState) { public void restoreInstanceState(Bundle savedInstanceState) {
initCallbackClass = savedInstanceState.getString("callbackClass"); initCallbackService = savedInstanceState.getString("callbackService");
} }
} }