Commit 00383e0

author

Sabari

committed

cookie clear issue fixed.

1 parent 572e8fb commit 00383e0Copy full SHA for 00383e0

File tree

+30

-5

lines changed

+30

-5

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public final class AppConstants {`
`21`	`21`	`public static final String EXPIRES = "expires";`
`22`	`22`	`public static final String ERROR = "error";`
`23`	`23`	`public static final String KEY = "key";`
	`24`	`+ public static final String IS_JUST_LOGGED_OUT = "isJustLoggedOut";`
`24`	`25`
`25`	`26`	`public static final Integer SOCKET_TIME_OUT = 5001;`
`26`	`27`	`public static final Integer IO_EXCEPTION = 5002;`

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ import android.content.Intent`
`4`	`4`	`import android.net.Uri`
`5`	`5`	`import android.os.Bundle`
`6`	`6`	`import android.view.View`
	`7`	`+import android.webkit.CookieManager`
	`8`	`+import android.webkit.CookieSyncManager`
`7`	`9`	`import android.widget.Button`
`8`	`10`	`import android.widget.ProgressBar`
`9`	`11`	`import com.nathansdev.stack.AppConstants`
`@@ -42,12 +44,25 @@ class LoginActivity : BaseActivity() {`
`42`	`44`	`showProgress()`
`43`	`45`	`}`
`44`	`46`	`buttonSkip?.setOnClickListener { routeToHome() }`
`45`		`- Timber.d("onCreate")`
	`47`	`+ checkLoggedOutIntent()`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ private fun checkLoggedOutIntent() {`
	`51`	`+ val isJusLoggedOut = intent?.extras?.getBoolean(AppConstants.IS_JUST_LOGGED_OUT)`
	`52`	`+ when (isJusLoggedOut) {`
	`53`	`+ true -> clearCookies()`
	`54`	`+ }`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ private fun clearCookies() {`
	`58`	`+ Timber.d("clearCookies")`
	`59`	`+ CookieSyncManager.createInstance(this)`
	`60`	`+ val cookieManager = CookieManager.getInstance()`
	`61`	`+ cookieManager.removeAllCookie()`
`46`	`62`	`}`
`47`	`63`
`48`	`64`	`override fun onResume() {`
`49`	`65`	`super.onResume()`
`50`		`- Timber.d("onResume %s", intent)`
`51`	`66`	`handleIntent()`
`52`	`67`	`}`
`53`	`68`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ private void handleProfileMenuClicked() {`
`193`	`193`
`194`	`194`	`private void handleLogOutCompleted() {`
`195`	`195`	`Intent intent = new Intent(this, LoginActivity.class);`
	`196`	`+ intent.putExtra(AppConstants.IS_JUST_LOGGED_OUT, true);`
`196`	`197`	`startActivity(intent);`
`197`	`198`	`finish();`
`198`	`199`	`}`
`@@ -205,6 +206,7 @@ private void handleBackPressed() {`
`205`	`206`	`if (profileViewContainer.getVisibility() == View.VISIBLE) {`
`206`	`207`	`Utils.captureTransitionSlide(rootView);`
`207`	`208`	`profileViewContainer.setVisibility(View.INVISIBLE);`
	`209`	`+ getProfileFrag().cleanUp();`
`208`	`210`	`} else {`
`209`	`211`	`super.onBackPressed();`
`210`	`212`	`}`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`import android.view.LayoutInflater;`
`13`	`13`	`import android.view.View;`
`14`	`14`	`import android.view.ViewGroup;`
`15`		`-import android.webkit.CookieManager;`
`16`	`15`
`17`	`16`	`import com.nathansdev.stack.AppConstants;`
`18`	`17`	`import com.nathansdev.stack.AppPreferences;`
`@@ -184,11 +183,13 @@ public void showUser(Owner owner) {`
`184`	`183`	`public void onLoggedOut() {`
`185`	`184`	`preferences.setIsLoggedIn(false);`
`186`	`185`	`preferences.delete();`
`187`		`- CookieManager cookieManager = CookieManager.getInstance();`
`188`		`- cookieManager.removeAllCookie();`
`189`	`186`	`eventBus.send(new Pair<>(AppEvents.LOGOUT_COMPLETED, null));`
`190`	`187`	`}`
`191`	`188`
	`189`	`+ public void cleanUp(){`
	`190`	`+ myFeedFragment.cleanUp();`
	`191`	`+ }`
	`192`	`+`
`192`	`193`	`public void logOutUser() {`
`193`	`194`	`mask.setVisibility(View.VISIBLE);`
`194`	`195`	`presenter.invalidateAccessToken(preferences.getAccessToken());`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,12 @@ public void onQuestionsLoaded(List<QuestionsAdapterRow> rows) {`
`88`	`88`	`adapter.notifyDataSetChanged();`
`89`	`89`	`}`
`90`	`90`
	`91`	`+ public void cleanUp() {`
	`92`	`+ if (dataset != null) {`
	`93`	`+ dataset.clearDataSet();`
	`94`	`+ }`
	`95`	`+ }`
	`96`	`+`
`91`	`97`	`@Override`
`92`	`98`	`public void onDestroyView() {`
`93`	`99`	`super.onDestroyView();`

Comments

(0)