Merge branch 'develop' into feature/create-channel

app/src/main/java/chat/rocket/android/webview/oauth/ui/OauthWebViewActivity.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.webkit.CookieManager
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.core.net.toUri
@@ -39,12 +40,15 @@ class OauthWebViewActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_web_view)
+
         webPageUrl = intent.getStringExtra(INTENT_WEB_PAGE_URL)
         requireNotNull(webPageUrl) { "no web_page_url provided in Intent extras" }
 
         state = intent.getStringExtra(INTENT_STATE)
         requireNotNull(state) { "no state provided in Intent extras" }
 
+        // Ensures that the cookies is always removed when opening the webview.
+        CookieManager.getInstance().removeAllCookies(null)
         setupToolbar()
     }
 

app/src/main/java/chat/rocket/android/webview/sso/ui/SsoWebViewActivity.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.webkit.CookieManager
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import chat.rocket.android.R
@@ -41,6 +42,8 @@ class SsoWebViewActivity : AppCompatActivity() {
         casToken = intent.getStringExtra(INTENT_SSO_TOKEN)
         requireNotNull(casToken) { "no cas_token provided in Intent extras" }
 
+        // Ensures that the cookies is always removed when opening the webview.
+        CookieManager.getInstance().removeAllCookies(null)
         setupToolbar()
     }