This commit is contained in:
Koitharu
2024-11-23 08:57:01 +02:00
parent 1568a48328
commit cffc6cfd39
11 changed files with 31 additions and 8 deletions

View File

@@ -18,8 +18,8 @@ android {
applicationId 'org.koitharu.kotatsu'
minSdk = 21
targetSdk = 35
versionCode = 689
versionName = '7.7-beta1'
versionCode = 690
versionName = '7.7-beta2'
generatedDensities = []
testInstrumentationRunner 'org.koitharu.kotatsu.HiltTestRunner'
ksp {

View File

@@ -27,3 +27,4 @@
-keep class org.acra.security.NoKeyStoreFactory { *; }
-keep class org.acra.config.DefaultRetryPolicy { *; }
-keep class org.acra.attachment.DefaultAttachmentProvider { *; }
-keep class org.acra.sender.JobSenderService

View File

@@ -44,7 +44,7 @@ class CaptchaNotifier(
.setContentTitle(channel.name)
.setPriority(NotificationCompat.PRIORITY_LOW)
.setDefaults(0)
.setSmallIcon(android.R.drawable.stat_notify_error)
.setSmallIcon(R.drawable.ic_bot)
.setGroup(GROUP_CAPTCHA)
.setAutoCancel(true)
.setVisibility(

View File

@@ -472,7 +472,10 @@ class AppSettings @Inject constructor(@ApplicationContext context: Context) {
get() = prefs.getBoolean(KEY_BACKUP_PERIODICAL_ENABLED, false)
val periodicalBackupFrequency: Long
get() = TimeUnit.DAYS.toMillis(prefs.getString(KEY_BACKUP_PERIODICAL_FREQUENCY, null)?.toLongOrNull() ?: 7L)
get() = prefs.getString(KEY_BACKUP_PERIODICAL_FREQUENCY, null)?.toLongOrNull() ?: 7L
val periodicalBackupFrequencyMillis: Long
get() = TimeUnit.DAYS.toMillis(periodicalBackupFrequency)
val periodicalBackupMaxCount: Int
get() = if (prefs.getBoolean(KEY_BACKUP_PERIODICAL_TRIM, true)) {

View File

@@ -112,9 +112,13 @@ abstract class BaseActivity<B : ViewBinding> :
}
override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
if (BuildConfig.DEBUG && keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
ActivityCompat.recreate(this)
return true
if (BuildConfig.DEBUG) {
if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
ActivityCompat.recreate(this)
return true
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
throw RuntimeException("Test crash")
}
}
return super.onKeyDown(keyCode, event)
}

View File

@@ -26,7 +26,7 @@ class PeriodicalBackupService : CoroutineIntentService() {
return
}
val lastBackupDate = externalBackupStorage.getLastBackupDate()
if (lastBackupDate != null && lastBackupDate.time + settings.periodicalBackupFrequency > System.currentTimeMillis()) {
if (lastBackupDate != null && lastBackupDate.time + settings.periodicalBackupFrequencyMillis > System.currentTimeMillis()) {
return
}
val output = BackupZipOutput.createTemp(applicationContext)

View File

@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FFFFFF">
<group android:scaleX="0.92"
android:scaleY="0.92"
android:translateX="0.96"
android:translateY="0.96">
<path
android:fillColor="#FF000000"
android:pathData="M12,2A2,2 0,0 1,14 4C14,4.74 13.6,5.39 13,5.73V7H14A7,7 0,0 1,21 14H22A1,1 0,0 1,23 15V18A1,1 0,0 1,22 19H21V20A2,2 0,0 1,19 22H5A2,2 0,0 1,3 20V19H2A1,1 0,0 1,1 18V15A1,1 0,0 1,2 14H3A7,7 0,0 1,10 7H11V5.73C10.4,5.39 10,4.74 10,4A2,2 0,0 1,12 2M7.5,13A2.5,2.5 0,0 0,5 15.5A2.5,2.5 0,0 0,7.5 18A2.5,2.5 0,0 0,10 15.5A2.5,2.5 0,0 0,7.5 13M16.5,13A2.5,2.5 0,0 0,14 15.5A2.5,2.5 0,0 0,16.5 18A2.5,2.5 0,0 0,19 15.5A2.5,2.5 0,0 0,16.5 13Z"/>
</group>
</vector>

Binary file not shown.

After

Width:  |  Height:  |  Size: 526 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1016 B