From 14d08b9491333d62d66c1c3b8b1b99b836e52933 Mon Sep 17 00:00:00 2001 From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com> Date: Sat, 13 Jan 2024 12:06:45 -0600 Subject: [PATCH] sad fucked up --- app/src/main/java/ani/dantotsu/MainActivity.kt | 8 -------- .../java/ani/dantotsu/offline/OfflineFragment.kt | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt index aeef4823..465efb1d 100644 --- a/app/src/main/java/ani/dantotsu/MainActivity.kt +++ b/app/src/main/java/ani/dantotsu/MainActivity.kt @@ -157,15 +157,7 @@ class MainActivity : AppCompatActivity() { if (!isOnline(this)) { snackString(this@MainActivity.getString(R.string.no_internet_connection)) startActivity(Intent(this, NoInternet::class.java)) - getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) - .edit() - .putBoolean("offlineMode", true) - .apply() } else { - getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) - .edit() - .putBoolean("offlineMode", false) - .apply() val model: AnilistHomeViewModel by viewModels() model.genres.observe(this) { it -> if (it != null) { diff --git a/app/src/main/java/ani/dantotsu/offline/OfflineFragment.kt b/app/src/main/java/ani/dantotsu/offline/OfflineFragment.kt index 71d1b4f0..a60f4870 100644 --- a/app/src/main/java/ani/dantotsu/offline/OfflineFragment.kt +++ b/app/src/main/java/ani/dantotsu/offline/OfflineFragment.kt @@ -9,6 +9,7 @@ import androidx.core.view.updateLayoutParams import androidx.fragment.app.Fragment import ani.dantotsu.App import ani.dantotsu.R +import ani.dantotsu.currContext import ani.dantotsu.databinding.FragmentOfflineBinding import ani.dantotsu.isOnline import ani.dantotsu.navBarHeight @@ -16,6 +17,7 @@ import ani.dantotsu.startMainActivity import ani.dantotsu.statusBarHeight class OfflineFragment : Fragment() { + private var offline = false override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -26,15 +28,23 @@ class OfflineFragment : Fragment() { topMargin = statusBarHeight bottomMargin = navBarHeight } - val offline = App.context?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) + offline = requireContext().getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) ?.getBoolean("offlineMode", false) ?: false binding.noInternet.text = if (!isOnline(requireContext())) getString(R.string.no_internet) else "OFFLINE MODE" binding.refreshButton.setOnClickListener { - if (!isOnline(requireContext()) && offline) { + println("Offline: $offline") + println("Online: ${isOnline(requireContext())}") + if (isOnline(requireContext()) && !offline) { startMainActivity(requireActivity()) } } return binding.root } + + override fun onResume() { + super.onResume() + offline = requireContext().getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) + ?.getBoolean("offlineMode", false) ?: false + } } \ No newline at end of file