diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3a3428a9a..d3198abc1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,6 @@ - (AppSettings.KEY_TRACK_SOURCES) ?.summaryProvider = MultiSummaryProvider(R.string.dont_check) - findPreference(AppSettings.KEY_DOZE_WHITELIST) - ?.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M } override fun onPreferenceTreeClick(preference: Preference?): Boolean { @@ -42,45 +34,7 @@ class TrackerSettingsFragment : BasePreferenceFragment(R.string.new_chapters_che } true } - AppSettings.KEY_DOZE_WHITELIST -> { - disablePowerOptimization() - true - } else -> super.onPreferenceTreeClick(preference) } } - - @SuppressLint("BatteryLife") - private fun disablePowerOptimization() { - val context = context ?: return - val powerManager = context.getSystemService(Context.POWER_SERVICE) as? PowerManager - if (powerManager == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - Snackbar.make( - listView ?: return, - R.string.operation_not_supported, - Snackbar.LENGTH_LONG - ).show() - return - } - val packageName = context.packageName - if (!powerManager.isIgnoringBatteryOptimizations(packageName)) { - val intent = Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS) - .setData(Uri.parse("package:$packageName")) - try { - startActivity(intent) - } catch (e: ActivityNotFoundException) { - Snackbar.make( - listView ?: return, - R.string.operation_not_supported, - Snackbar.LENGTH_LONG - ).show() - } - } else { - Snackbar.make( - listView ?: return, - R.string.power_optimization_already_disabled, - Snackbar.LENGTH_LONG - ).show() - } - } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt index 6aa02064a..c8877066e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt +++ b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt @@ -52,9 +52,7 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) : if (tracks.isEmpty()) { return Result.success() } - if (tracks.size >= FOREGROUND_TRACKERS_THRESHOLD) { - setForeground(createForegroundInfo()) - } + setForeground(createForegroundInfo()) var success = 0 val workData = Data.Builder() .putInt(DATA_TOTAL, tracks.size) @@ -204,8 +202,11 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) : private fun createForegroundInfo(): ForegroundInfo { val title = applicationContext.getString(R.string.new_chapters_checking) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val channel = - NotificationChannel(WORKER_CHANNEL_ID, title, NotificationManager.IMPORTANCE_NONE) + val channel = NotificationChannel( + WORKER_CHANNEL_ID, + title, + NotificationManager.IMPORTANCE_LOW + ) channel.setShowBadge(false) channel.enableVibration(false) channel.setSound(null, null) @@ -235,7 +236,6 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) : private const val DATA_PROGRESS = "progress" private const val DATA_TOTAL = "total" private const val TAG = "tracking" - private const val FOREGROUND_TRACKERS_THRESHOLD = 4 @RequiresApi(Build.VERSION_CODES.O) private fun createNotificationChannel(context: Context) { diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d1b6dd2fd..c47672f94 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -195,9 +195,6 @@ Проверка новых глав: %1$d из %2$d Очистить ленту Вся история обновлений будет очищена и её нельзя будет вернуть. Вы уверены? - Может помочь с фоновыми операциями. Используйте только если фоновая проверка новых глав не работает - Отключить оптимизацию батареи - Отпимизация батареи уже отключена Проверка новых глав В обратном порядке Войти diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9672c2313..6bc13ea1b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -197,9 +197,6 @@ Checking for new chapters: %1$d of %2$d Clear feed All updates history will be cleared and this action cannot be undone. Are you sure? - Power optimization is already disabled - Helps with background operations such as checking for new chapters. Use only if you have a troubles with it - Disable power optimization New chapters checking Reverse Sign in diff --git a/app/src/main/res/xml/pref_tracker.xml b/app/src/main/res/xml/pref_tracker.xml index 74f3c8361..4b0b393ac 100644 --- a/app/src/main/res/xml/pref_tracker.xml +++ b/app/src/main/res/xml/pref_tracker.xml @@ -1,8 +1,7 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> - -