Skip to content

Commit d6c0110

Browse files
msfjarvismaestromac
authored andcommitted
Codestyle cleanup (#22)
1 parent 8354ecd commit d6c0110

File tree

2 files changed

+25
-17
lines changed

2 files changed

+25
-17
lines changed

.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/to/dev/dev_android/view/main/view/CustomWebViewClient.kt

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,49 @@
11
package to.dev.dev_android.view.main.view
22

33
import android.content.Context
4-
import android.net.Uri
5-
import androidx.browser.customtabs.CustomTabsIntent
6-
import android.webkit.WebView
7-
import android.webkit.WebViewClient
8-
import androidx.core.content.ContextCompat.startActivity
94
import android.content.Intent
10-
import android.graphics.Bitmap
5+
import android.net.Uri
116
import android.os.Build
127
import android.view.View
138
import android.webkit.CookieManager
14-
import android.webkit.CookieSyncManager
9+
import android.webkit.WebView
10+
import android.webkit.WebViewClient
11+
import androidx.browser.customtabs.CustomTabsIntent
1512
import to.dev.dev_android.databinding.ActivityMainBinding
1613

17-
class CustomWebViewClient(val context: Context, val binding: ActivityMainBinding) : WebViewClient() {
14+
class CustomWebViewClient(private val context: Context, private val binding: ActivityMainBinding) : WebViewClient() {
15+
16+
private val overrideUrlList = listOf(
17+
"api.twitter.com/oauth",
18+
"api.twitter.com/account/login_verification",
19+
"github.com/login",
20+
"github.com/sessions/"
21+
)
1822
override fun onPageFinished(view: WebView, url: String?) {
1923
binding.splash.visibility = View.GONE
2024
view.visibility = View.VISIBLE
2125
super.onPageFinished(view, url)
2226
}
2327

2428
override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
25-
if(view.originalUrl == "https://dev.to/signout_confirm" && url == "https://dev.to/") {
29+
if (view.originalUrl == "https://dev.to/signout_confirm" && url == "https://dev.to/") {
2630
view.clearCache(true)
2731
view.clearFormData()
2832
view.clearHistory()
29-
when (Build.VERSION.SDK_INT) {
30-
in Int.MIN_VALUE..20 -> CookieManager.getInstance().removeAllCookie()
31-
else -> CookieManager.getInstance().removeAllCookies(null)
33+
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP) {
34+
CookieManager.getInstance().removeAllCookie()
35+
} else {
36+
CookieManager.getInstance().removeAllCookies(null)
3237
}
3338
}
3439

3540
if (url.contains("://dev.to")) {
3641
return false
3742
} else {
38-
if(url.contains("api.twitter.com/oauth") ||
39-
url.contains("api.twitter.com/account/login_verification") ||
40-
url.contains("github.com/login") ||
41-
url.contains("github.com/sessions/")) {
42-
return false
43+
for (i in 0 until overrideUrlList.size) {
44+
if (url.contains(overrideUrlList[i])) {
45+
return false
46+
}
4347
}
4448
val builder = CustomTabsIntent.Builder()
4549
builder.setToolbarColor(-0x1000000)

0 commit comments

Comments
 (0)