From 9a7401c77a710facc6d1eec51d8e8cf87ed72180 Mon Sep 17 00:00:00 2001
From: Cloudburst <18114966+C10udburst@users.noreply.github.com>
Date: Sat, 11 Feb 2023 14:04:29 +0000
Subject: [PATCH] add snackbar and fix blocking
---
.../lagradost/cloudstream3/MainActivity.kt | 21 ++++++++++++++++---
app/src/main/res/values/strings.xml | 1 +
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 5d5940e3..041d3e22 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.google.android.gms.cast.framework.*
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.navigationrail.NavigationRailView
+import com.google.android.material.snackbar.Snackbar
import com.jaredrummler.android.colorpicker.ColorPickerDialogListener
import com.lagradost.cloudstream3.app
import com.lagradost.cloudstream3.APIHolder.allProviders
@@ -719,9 +720,23 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
// Automatically enable jsdelivr if cant connect to raw.githubusercontent.com
if (!settingsManager.contains("jsdelivr_proxy_key")) {
- settingsManager.edit()
- .putBool("jsdelivr_proxy_key", !checkGithubConnectivity())
- .apply()
+ runBlocking {
+ if (checkGithubConnectivity()) {
+ setKey("jsdelivr_proxy_key", false)
+ } else {
+ setKey("jsdelivr_proxy_key", true)
+ val parentView = findViewById(android.R.id.content)
+ Snackbar.make(parentView, getString(R.string.jsdelivr_enabled), Snackbar.LENGTH_LONG)
+ .setAction("Revert", v -> {
+ setKey("jsdelivr_proxy_key", false)
+ })
+ .setBackgroundTint(0xffffbb33)
+ .setTextColor(Color.BLACK)
+ .setActionTextColor(Color.BLACK)
+ .show()
+ }
+
+ }
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index addb485e..d7ce49e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -374,6 +374,7 @@
DNS over HTTPS
Useful for bypassing ISP blocks
raw.githubusercontent.com Proxy
+ Failed to reach GitHub, enabling jsdelivr proxy.
Bypasses blocking of GitHub using jsdelivr, may cause updates to be delayed by few days.
Clone site
Remove site