Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reverting the back button change that I made, for some reason certain…

… methods aren't inherited when you extend DroidGap
  • Loading branch information...
commit 1e5457a47d338a49abda674af5480f2cf4416c1b 1 parent 7b75e2f
@infil00p infil00p authored
Showing with 24 additions and 2 deletions.
  1. +24 −2 framework/src/org/apache/cordova/DroidGap.java
View
26 framework/src/org/apache/cordova/DroidGap.java
@@ -48,6 +48,7 @@ Licensed to the Apache Software Foundation (ASF) under one
import android.media.AudioManager;
import android.net.Uri;
import android.os.Bundle;
+import android.util.Log;
import android.view.Display;
import android.view.KeyEvent;
import android.view.Menu;
@@ -1078,15 +1079,23 @@ public void endActivity() {
* (non-Javadoc)
* @see android.app.Activity#onBackPressed()
*/
+ /*
@Override
public void onBackPressed()
{
- // If back key is bound, then send event to JavaScript
+ Log.d("BackPressed", "in onBackPressed");
+ Log.d("BackPressed", "bound = " + this.bound);
+ //Log.d("BackPressed", "backHistory = " + this.backHistory());
+ // If back key is bound, then send event to JavaScript
+
if (!(this.bound || this.backHistory())) {
+ Log.d("BackPressed", "exiting");
this.activityState = ACTIVITY_EXITING;
super.onBackPressed();
}
}
+ */
+
/**
* Called when a key is de-pressed. (Key UP)
@@ -1102,13 +1111,25 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
// If back key
if (keyCode == KeyEvent.KEYCODE_BACK) {
+ Log.d("BackButton", "I got an up from KEYCODE_BACK");
// If back key is bound, then send event to JavaScript
if (this.bound) {
+ Log.d("BackButton", "bound is true firing an event to JS");
this.appView.loadUrl("javascript:cordova.fireDocumentEvent('backbutton');");
return true;
+ } else {
+ // If not bound
+ // Go to previous page in webview if it is possible to go back
+ if (this.backHistory()) {
+ return true;
+ }
+ // If not, then invoke behavior of super class
+ else {
+ this.activityState = ACTIVITY_EXITING;
+ return super.onKeyUp(keyCode, event);
+ }
}
-
}
// If menu key
@@ -1123,6 +1144,7 @@ else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
return true;
}
+ Log.d("BackPressed", "returning false");
return false;
}
Please sign in to comment.
Something went wrong with that request. Please try again.