Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
Avoid using a boolean flag and move add add/remove code to Session
Browse files Browse the repository at this point in the history
  • Loading branch information
@keianhzo
keianhzo committed Jul 14, 2020
1 parent 43c1bd7 commit 0b8d765
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 31 deletions.
46 changes: 19 additions & 27 deletions app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ public class Session implements ContentBlocking.Delegate, GeckoSession.Navigatio
private transient byte[] mPrivatePage;
private transient boolean mFirstContentfulPaint;
private transient long mKeepAlive;
private transient boolean mSessionAdded;

public interface BitmapChangedListener {
void onBitmapChanged(Session aSession, Bitmap aBitmap);
Expand All @@ -114,21 +113,22 @@ public interface DrmStateChangedListener {
public static final int SESSION_OPEN = 0;
public static final int SESSION_DO_NOT_OPEN = 1;

protected Session(Context aContext, GeckoRuntime aRuntime,
@NonNull SessionSettings aSettings) {
protected Session(Context aContext, GeckoRuntime aRuntime) {
mContext = aContext;
mRuntime = aRuntime;
initialize();
mState = createSession(aSettings);
mSessionAdded = true;
}

protected Session(Context aContext, GeckoRuntime aRuntime, @NonNull SessionState aRestoreState) {
mContext = aContext;
mRuntime = aRuntime;
initialize();
mState = aRestoreState;
mSessionAdded = false;
}

public void createSession(@NonNull SessionSettings aSettings) {
mState = createSessionState(aSettings);
mSessionChangeListeners.forEach(listener -> listener.onSessionAdded(this));
}

private void initialize() {
Expand Down Expand Up @@ -161,8 +161,8 @@ private void initialize() {

protected void shutdown() {
if (mState.mSession != null) {
closeSession(mState);
mState.mSession = null;
setActive(false);
suspend();
}

if (mState.mParentId != null) {
Expand All @@ -172,11 +172,6 @@ protected void shutdown() {
}
}

mSessionChangeListeners.forEach(listener -> {
listener.onSessionRemoved(mState.mId);
mSessionAdded = false;
});

mQueuedCalls.clear();
mNavigationListeners.clear();
mProgressListeners.clear();
Expand Down Expand Up @@ -430,6 +425,8 @@ public void suspend() {
return;
}

mSessionChangeListeners.forEach(listener -> listener.onSessionRemoved(mState.mId));

Log.d(LOGTAG, "Suspending Session: " + mState.mId);
closeSession(mState);
mState.mSession = null;
Expand Down Expand Up @@ -458,7 +455,7 @@ private void loadDefaultPage() {
}
}

private void restore(boolean addSession) {
private void restore() {
SessionSettings settings = mState.mSettings;
if (settings == null) {
settings = new SessionSettings.Builder()
Expand All @@ -470,12 +467,7 @@ private void restore(boolean addSession) {

mState.mSession = createGeckoSession(settings);

// We call restore when a session is first activated and when it's recreated.
// We only need to notify of the session creation if it's not a recreation.
if (addSession) {
mSessionChangeListeners.forEach(listener -> listener.onSessionAdded(this));
mSessionAdded = true;
}
mSessionChangeListeners.forEach(listener -> listener.onSessionAdded(this));

openSession();

Expand All @@ -498,7 +490,7 @@ private void restore(boolean addSession) {
}


private SessionState createSession(@NonNull SessionSettings aSettings) {
private SessionState createSessionState(@NonNull SessionSettings aSettings) {
SessionState state = new SessionState();
state.mSettings = aSettings;
state.mSession = createGeckoSession(aSettings);
Expand Down Expand Up @@ -541,7 +533,9 @@ void recreateSession() {

mState = mState.recreate();

restore(false);
mSessionChangeListeners.forEach(listener -> listener.onSessionRemoved(mState.mId));

restore();

for (SessionChangeListener listener: mSessionChangeListeners) {
listener.onSessionStateChanged(this, true);
Expand All @@ -563,9 +557,7 @@ void openSession() {
mState.mSession.open(mRuntime);
}

mSessionChangeListeners.forEach(listener -> {
listener.onSessionOpened(this);
});
mSessionChangeListeners.forEach(listener -> listener.onSessionOpened(this));
}

private void closeSession(@NonNull SessionState aState) {
Expand Down Expand Up @@ -803,7 +795,7 @@ public void setActive(boolean aActive) {
mState.setActive(aActive);

} else if (aActive) {
restore(!mSessionAdded);
restore();

} else {
Log.e(LOGTAG, "ERROR: Setting null GeckoView to inactive!");
Expand Down Expand Up @@ -868,7 +860,7 @@ public void toggleServo() {
.withServo(!isInstanceOfServoSession(mState.mSession))
.build();

mState = createSession(settings);
mState = createSessionState(settings);
openSession();
closeSession(previous);

Expand Down
24 changes: 20 additions & 4 deletions app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,19 @@ public void onTrackingProtectionLevelUpdated(int level) {
if (BuildConfig.DEBUG) {
mStoreSubscription = ComponentsAdapter.get().getStore().observeManually(browserState -> {
Log.d(LOGTAG, "Session status BEGIN");
Log.d(LOGTAG, "BrowserStore: " + browserState.getTabs().size() + ", SessionStore: " + mSessions.size());
Log.d(LOGTAG, "[Total] BrowserStore: " + browserState.getTabs().size() + ", SessionStore: " + mSessions.size());
for (int i=0; i<browserState.getTabs().size(); i++) {
Log.d(LOGTAG, "BrowserStore Session: " + browserState.getTabs().get(i).getId());
}
int suspendedCount = 0;
for (int i=0; i<mSessions.size(); i++) {
Log.d(LOGTAG, "SessionStore Session: " + mSessions.get(i).getId());
boolean suspended = mSessions.get(i).getSessionState().mSession == null && !mSessions.get(i).isActive();
Log.d(LOGTAG, "SessionStore Session: " + mSessions.get(i).getId() + (suspended ? " (suspended)" : ""));
if (suspended) {
suspendedCount++;
}
}
Log.d(LOGTAG, "[Alive] BrowserStore: " + browserState.getTabs().size() + ", SessionStore: " + (mSessions.size() - suspendedCount));
Log.d(LOGTAG, "Session status END");
return null;
});
Expand All @@ -169,6 +175,10 @@ private Session addSession(@NonNull Session aSession) {
mSessions.add(aSession);
sessionActiveStateChanged();

if (BuildConfig.DEBUG) {
mStoreSubscription.resume();
}

return aSession;
}

Expand All @@ -186,9 +196,9 @@ public Session createSession(boolean openSession, boolean aPrivateMode) {

@NonNull
Session createSession(@NonNull SessionSettings aSettings, @Session.SessionOpenModeFlags int aOpenMode) {
Session session = new Session(mContext, mRuntime, aSettings);
Session session = new Session(mContext, mRuntime);
session.addSessionChangeListener(this);
onSessionAdded(session);
session.createSession(aSettings);
if (aOpenMode == Session.SESSION_OPEN) {
session.openSession();
session.setActive(true);
Expand Down Expand Up @@ -216,6 +226,9 @@ public Session createSuspendedSession(final String aUri, final boolean aPrivateM
private void shutdownSession(@NonNull Session aSession) {
aSession.setPermissionDelegate(null);
aSession.shutdown();
if (BuildConfig.DEBUG) {
mStoreSubscription.resume();
}
}

public void destroySession(Session aSession) {
Expand All @@ -241,6 +254,9 @@ public void suspendAllInactiveSessions() {
session.suspend();
}
}
if (BuildConfig.DEBUG) {
mStoreSubscription.resume();
}
}

public @Nullable Session getSession(String aId) {
Expand Down

0 comments on commit 0b8d765

Please sign in to comment.