wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 896992 - Activity looping if GeckoApp has been killed and Settings is launched from notification. r=kats

Browse Source
This commit is contained in:
Chenxia Liu 2013-07-30 11:45:25 -07:00
parent e95830ec39
commit 68fe35ecfa
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mobile/android/base/GeckoApp.java
View File

@ -152,6 +152,7 @@ abstract public class GeckoApp
public static final String ACTION_LOAD = "org.mozilla.gecko.LOAD";
public static final String ACTION_LAUNCH_SETTINGS = "org.mozilla.gecko.SETTINGS";
public static final String ACTION_INIT_PW = "org.mozilla.gecko.INIT_PW";
public static final String SAVED_STATE_INTENT_HANDLED = "intentHandled";
public static final String SAVED_STATE_IN_BACKGROUND = "inBackground";
public static final String SAVED_STATE_PRIVATE_SESSION = "privateSession";
@ -184,6 +185,7 @@ abstract public class GeckoApp
protected GeckoProfile mProfile;
public static int mOrientation;
protected boolean mIsRestoringActivity;
private boolean mIntentHandled;
private String mCurrentResponse = "";
public static boolean sIsUsingCustomProfile = false;
@ -492,6 +494,11 @@ abstract public class GeckoApp
outState.putBoolean(SAVED_STATE_IN_BACKGROUND, isApplicationInBackground());
outState.putString(SAVED_STATE_PRIVATE_SESSION, mPrivateBrowsingSession);
// Bug 896992 - Replace intent action with ACTION_MAIN on restart.
if (mIntentHandled) {
outState.putBoolean(SAVED_STATE_INTENT_HANDLED, true);
}
}
void handleFaviconRequest(final String url) {
@ -1334,6 +1341,16 @@ abstract public class GeckoApp
Telemetry.HistogramAdd("FENNEC_WAS_KILLED", 1);
}
if (savedInstanceState.getBoolean(SAVED_STATE_INTENT_HANDLED, false)) {
Intent thisIntent = getIntent();
// Bug 896992 - This intent has already been handled, clear the intent action.
thisIntent.setAction(Intent.ACTION_MAIN);
setIntent(thisIntent);
// Persist this flag for reincarnations of this Activity Intent.
mIntentHandled = true;
}
mPrivateBrowsingSession = savedInstanceState.getString(SAVED_STATE_PRIVATE_SESSION);
}
@ -1516,6 +1533,7 @@ abstract public class GeckoApp
// Check if launched from data reporting notification.
if (ACTION_LAUNCH_SETTINGS.equals(action)) {
mIntentHandled = true;
Intent settingsIntent = new Intent(GeckoApp.this, GeckoPreferences.class);
// Copy extras.
settingsIntent.putExtras(intent);
@ -1920,7 +1938,8 @@ abstract public class GeckoApp
GeckoAppShell.sendEventToGecko(GeckoEvent.createURILoadEvent(uri));
} else if (ACTION_ALERT_CALLBACK.equals(action)) {
processAlertCallback(intent);
} if (ACTION_LAUNCH_SETTINGS.equals(action)) {
} else if (ACTION_LAUNCH_SETTINGS.equals(action)) {
mIntentHandled = true;
// Check if launched from data reporting notification.
Intent settingsIntent = new Intent(GeckoApp.this, GeckoPreferences.class);
// Copy extras.