From ef659408026a4bf2f3bbb3a113d035232c093101 Mon Sep 17 00:00:00 2001 From: merkost Date: Tue, 18 Jul 2023 11:50:59 +1000 Subject: [PATCH 1/2] Small gradle refactoring --- app/build.gradle | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e79b2ba1b..7b36c3af7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' -apply plugin: 'de.timfreiheit.resourceplaceholders' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' + id 'de.timfreiheit.resourceplaceholders' +} def keystorePropertiesFile = rootProject.file("keystore.properties") def keystoreProperties = new Properties() From 1d9ea4a69bafab8a5a4c5be64bd700c3a7b5629b Mon Sep 17 00:00:00 2001 From: merkost Date: Tue, 18 Jul 2023 12:06:12 +1000 Subject: [PATCH 2/2] Main backup settings moved to commons --- .../calendar/pro/helpers/Config.kt | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt index 09cfdafde..40628dfa6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt @@ -3,8 +3,6 @@ package com.simplemobiletools.calendar.pro.helpers import android.content.Context import android.media.AudioManager import android.media.RingtoneManager -import android.os.Environment -import android.os.Environment.DIRECTORY_DOWNLOADS import com.simplemobiletools.calendar.pro.R import com.simplemobiletools.calendar.pro.extensions.config import com.simplemobiletools.calendar.pro.extensions.scheduleCalDAVSync @@ -261,18 +259,6 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(WAS_FILTERED_OUT_WARNING_SHOWN, false) set(wasFilteredOutWarningShown) = prefs.edit().putBoolean(WAS_FILTERED_OUT_WARNING_SHOWN, wasFilteredOutWarningShown).apply() - var autoBackup: Boolean - get() = prefs.getBoolean(AUTO_BACKUP, false) - set(enableAutomaticBackups) = prefs.edit().putBoolean(AUTO_BACKUP, enableAutomaticBackups).apply() - - var autoBackupFolder: String - get() = prefs.getString(AUTO_BACKUP_FOLDER, Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS).absolutePath)!! - set(autoBackupPath) = prefs.edit().putString(AUTO_BACKUP_FOLDER, autoBackupPath).apply() - - var autoBackupFilename: String - get() = prefs.getString(AUTO_BACKUP_FILENAME, "")!! - set(autoBackupFilename) = prefs.edit().putString(AUTO_BACKUP_FILENAME, autoBackupFilename).apply() - var autoBackupEventTypes: Set get() = prefs.getStringSet(AUTO_BACKUP_EVENT_TYPES, HashSet())!! set(autoBackupEventTypes) = prefs.edit().remove(AUTO_BACKUP_EVENT_TYPES).putStringSet(AUTO_BACKUP_EVENT_TYPES, autoBackupEventTypes).apply() @@ -289,7 +275,4 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(AUTO_BACKUP_PAST_ENTRIES, true) set(autoBackupPastEntries) = prefs.edit().putBoolean(AUTO_BACKUP_PAST_ENTRIES, autoBackupPastEntries).apply() - var lastAutoBackupTime: Long - get() = prefs.getLong(LAST_AUTO_BACKUP_TIME, 0L) - set(lastAutoBackupTime) = prefs.edit().putLong(LAST_AUTO_BACKUP_TIME, lastAutoBackupTime).apply() }