Repository: cordova-android
Updated Branches:
refs/heads/master 0669eddda -> 500ccd8e8
CB-8764 Save instanceState before calling super
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7cf7311a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7cf7311a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7cf7311a
Branch: refs/heads/master
Commit: 7cf7311a9dd2bb2da0d06c9f95ce0b94e376ed6f
Parents: 0669edd
Author: Serge Huijben <s....@gmail.com>
Authored: Fri Mar 27 10:12:29 2015 +0100
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Mar 27 10:15:41 2015 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/CordovaActivity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7cf7311a/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index ab1ef88..a40aaa6 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -439,8 +439,8 @@ public class CordovaActivity extends Activity {
protected void onSaveInstanceState(Bundle outState)
{
- super.onSaveInstanceState(outState);
cordovaInterface.onSaveInstanceState(outState);
+ super.onSaveInstanceState(outState);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
CB-8764 Store serviceName instead of class (close #169)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/500ccd8e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/500ccd8e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/500ccd8e
Branch: refs/heads/master
Commit: 500ccd8e803fc731c41a8ad2ba488e4ccb8635ec
Parents: 7cf7311
Author: Serge Huijben <s....@gmail.com>
Authored: Fri Mar 27 12:52:11 2015 +0100
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Mar 27 10:15:48 2015 -0400
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaInterfaceImpl.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/500ccd8e/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
index a693764..2dc6b3d 100644
--- a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
+++ b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
@@ -18,7 +18,7 @@ public class CordovaInterfaceImpl implements CordovaInterface {
protected PluginManager pluginManager;
protected CordovaPlugin activityResultCallback;
- protected String initCallbackClass;
+ protected String initCallbackService;
protected int activityResultRequestCode;
public CordovaInterfaceImpl(Activity activity) {
@@ -77,12 +77,12 @@ public class CordovaInterfaceImpl implements CordovaInterface {
*/
public boolean onActivityResult(int requestCode, int resultCode, Intent intent) {
CordovaPlugin callback = activityResultCallback;
- if(callback == null && initCallbackClass != null) {
+ if(callback == null && initCallbackService != null) {
// The application was restarted, but had defined an initial callback
// before being shut down.
- callback = pluginManager.getPlugin(initCallbackClass);
+ callback = pluginManager.getPlugin(initCallbackService);
}
- initCallbackClass = null;
+ initCallbackService = null;
activityResultCallback = null;
if (callback != null) {
@@ -108,8 +108,8 @@ public class CordovaInterfaceImpl implements CordovaInterface {
*/
public void onSaveInstanceState(Bundle outState) {
if (activityResultCallback != null) {
- String cClass = activityResultCallback.getClass().getName();
- outState.putString("callbackClass", cClass);
+ String serviceName = activityResultCallback.getServiceName();
+ 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.
*/
public void restoreInstanceState(Bundle savedInstanceState) {
- initCallbackClass = savedInstanceState.getString("callbackClass");
+ initCallbackService = savedInstanceState.getString("callbackService");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org