diff --git a/app/src/main/java/com/vanced/manager/core/App.kt b/app/src/main/java/com/vanced/manager/core/App.kt index 19b4d6a5..0cf59306 100644 --- a/app/src/main/java/com/vanced/manager/core/App.kt +++ b/app/src/main/java/com/vanced/manager/core/App.kt @@ -13,11 +13,12 @@ class App: Application() { override fun onCreate() { super.onCreate() - checkUpdates() + //checkUpdates() PRDownloader.initialize(applicationContext) createNotifChannel(this) } + /* private fun checkUpdates() { val checkPrefs = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("auto_check_update", true) if (checkPrefs) { @@ -28,4 +29,6 @@ class App: Application() { } } + */ + } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/core/Main.kt b/app/src/main/java/com/vanced/manager/core/Main.kt index dd25b47e..fe431309 100644 --- a/app/src/main/java/com/vanced/manager/core/Main.kt +++ b/app/src/main/java/com/vanced/manager/core/Main.kt @@ -3,11 +3,16 @@ package com.vanced.manager.core import android.annotation.SuppressLint import android.content.Context import android.os.Bundle +import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.preference.PreferenceManager +import com.dezlum.codelabs.getjson.GetJson +import com.vanced.manager.R import com.vanced.manager.ui.dialogs.DialogContainer.showRootDialog import com.vanced.manager.ui.dialogs.DialogContainer.showSecurityDialog import com.vanced.manager.ui.dialogs.DialogContainer.statementFalse +import com.vanced.manager.ui.fragments.UpdateCheckFragment +import com.vanced.manager.utils.InternetTools.isUpdateAvailable // This activity will NOT be used in manifest // since MainActivity will extend it @@ -18,17 +23,17 @@ open class Main: AppCompatActivity() { super.onCreate(savedInstanceState) val prefs = PreferenceManager.getDefaultSharedPreferences(this) - val firstStart = prefs.getBoolean("firstStart", true) - val falseStatement = prefs.getBoolean("statement", true) val variant = prefs.getString("vanced_variant", "nonroot") val showRootDialog = prefs.getBoolean("show_root_dialog", true) when { - firstStart -> showSecurityDialog(this) - !falseStatement -> statementFalse(this) + prefs.getBoolean("firstStart", true) -> showSecurityDialog(this) + !prefs.getBoolean("statement", true) -> statementFalse(this) variant == "root" && showRootDialog -> showRootDialog(this) } + checkUpdates() + } override fun onPause() { @@ -38,4 +43,13 @@ open class Main: AppCompatActivity() { super.onPause() } + private fun checkUpdates() { + if (GetJson().isConnected(this) && isUpdateAvailable()) { + val fm = supportFragmentManager + UpdateCheckFragment().show(fm, "UpdateCheck") + } else { + Toast.makeText(this, getString(R.string.update_notfound), Toast.LENGTH_SHORT).show() + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt index 61bc9f63..ea9ae754 100644 --- a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt +++ b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt @@ -1,5 +1,6 @@ package com.vanced.manager.utils +import android.app.Activity import android.content.Context import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent