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

Bug 126: NullPointerException in onDestroy()

Browse Source
This commit is contained in:
Bryce Curtis 2011-04-05 15:42:25 -05:00
parent e766188689
commit 626119ae3b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/src/com/phonegap/DroidGap.java
View File

@ -601,6 +601,10 @@ public class DroidGap extends PhonegapActivity {
*/
protected void onPause() {
super.onPause();
if (this.appView == null) {
return;
}
// Send pause event to JavaScript
this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};");
@ -621,6 +625,9 @@ public class DroidGap extends PhonegapActivity {
*/
protected void onResume() {
super.onResume();
if (this.appView == null) {
return;
}
// Send resume event to JavaScript
this.appView.loadUrl("javascript:try{PhoneGap.onResume.fire();}catch(e){};");
@ -649,6 +656,8 @@ public class DroidGap extends PhonegapActivity {
public void onDestroy() {
super.onDestroy();
if (this.appView != null) {
// Make sure pause event is sent if onPause hasn't been called before onDestroy
this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};");
@ -664,6 +673,7 @@ public class DroidGap extends PhonegapActivity {
if (this.callbackServer != null) {
this.callbackServer.destroy();
}
}
}
/**
@ -1099,6 +1109,9 @@ public class DroidGap extends PhonegapActivity {
*/
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (this.appView == null) {
return super.onKeyDown(keyCode, event);
}
// If back key
if (keyCode == KeyEvent.KEYCODE_BACK) {