github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 07:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Doing the merge and fixing DroidGap up a bit

Browse Source
This commit is contained in:
Joe Bowser 2012-11-28 15:30:22 -08:00
parent a0d2b96de6
commit c8ec7e5191
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/src/org/apache/cordova/DroidGap.java
View File

@ -816,7 +816,7 @@ public class DroidGap extends Activity implements CordovaInterface {
* @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras"). * @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
*/ */
protected void onActivityResult(int requestCode, int resultCode, Intent intent) { protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
Log.d(TAG, "Incoming Result"); LOG.d(TAG, "Incoming Result");
super.onActivityResult(requestCode, resultCode, intent); super.onActivityResult(requestCode, resultCode, intent);
CordovaPlugin callback = this.activityResultCallback; CordovaPlugin callback = this.activityResultCallback;
if(callback == null) if(callback == null)
@ -825,13 +825,13 @@ public class DroidGap extends Activity implements CordovaInterface {
{ {
this.activityResultCallback = appView.pluginManager.getPlugin(initCallbackClass); this.activityResultCallback = appView.pluginManager.getPlugin(initCallbackClass);
callback = activityResultCallback; callback = activityResultCallback;
Log.d(TAG, "We have a callback to send this result to"); LOG.d(TAG, "We have a callback to send this result to");
callback.onActivityResult(requestCode, resultCode, intent); callback.onActivityResult(requestCode, resultCode, intent);
} }
} }
else else
{ {
Log.d(TAG, "We have a callback to send this result to"); LOG.d(TAG, "We have a callback to send this result to");
callback.onActivityResult(requestCode, resultCode, intent); callback.onActivityResult(requestCode, resultCode, intent);
} }
} }