Skip to content

Commit c7a6bf2

Browse files
Saud-97Saud-97
committed
Merge remote-tracking branch 'j2k/master'
# Conflicts: # .github/ISSUE_TEMPLATE.md # .github/ISSUE_TEMPLATE/feature_request.yml # .github/ISSUE_TEMPLATE/issue_report.yml # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-bg/strings.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fil/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-in/strings.xml # app/src/main/res/values-ko/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values-ro/strings.xml # app/src/main/res/values-sc/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-uk/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # buildSrc/src/main/kotlin/Dependencies.kt
2 parents 6b09873 + 8946395 commit c7a6bf2

File tree

97 files changed

+2500
-1356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2500
-1356
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ I acknowledge that:
44

55
- If this is a bug or a feature, I will not use this issue template and instead use one of the options on the previous page
66
- I have tried the troubleshooting guide: https://tachiyomi.org/docs/guides/troubleshooting/
7-
- I have updated to the latest version of the app (v1.7.3)
7+
- I have updated to the latest version of the app (v1.7.4)
88
- I will not repeat an issue already requested
99
- If this is an request for an extension/source, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions
1010

‎.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ body:
3535
required: true
3636
- label: If this is an issue with an extension, or a request for an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
3737
required: true
38-
- label: I have updated the app to version **[1.7.3](https://github.com/saud-97/TachiyomiS97/releases/latest)**.
38+
- label: I have updated the app to version **[1.7.4](https://github.com/saud-97/TachiyomiS97/releases/latest)**.
3939
required: true
4040
- label: I have checked through the app settings for my feature.
4141
required: true

‎.github/ISSUE_TEMPLATE/issue_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ body:
100100
required: true
101101
- label: I have tried the [troubleshooting guide](https://tachiyomi.org/help/guides/troubleshooting/).
102102
required: true
103-
- label: I have updated the app to version **[1.7.3](https://github.com/saud-97/TachiyomiS97/releases/latest)**.
103+
- label: I have updated the app to version **[1.7.4](https://github.com/saud-97/TachiyomiS97/releases/latest)**.
104104
required: true
105105
- label: I have updated all installed extensions.
106106
required: true

‎.github/workflows/build_push.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929

3030
- name: Validate Gradle Wrapper
3131
uses: gradle/wrapper-validation-action@v1
32+
33+
- name: Setup Android SDK
34+
run: |
35+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.3"
3236
3337
- name: Set up JDK
3438
uses: actions/setup-java@v3

‎app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@
6060
<action android:name="android.intent.action.MAIN" />
6161
<category android:name="android.intent.category.LAUNCHER" />
6262
</intent-filter>
63+
<!-- Deep link to add repos -->
64+
<intent-filter android:label="@string/action_add_repo">
65+
<action android:name="android.intent.action.VIEW" />
66+
67+
<category android:name="android.intent.category.DEFAULT" />
68+
<category android:name="android.intent.category.BROWSABLE" />
69+
70+
<data android:scheme="tachiyomi" />
71+
<data android:host="add-repo" />
72+
</intent-filter>
6373
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
6474
</activity>
6575
<activity

‎app/src/main/java/eu/kanade/tachiyomi/AppModule.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
1313
import eu.kanade.tachiyomi.data.track.TrackManager
1414
import eu.kanade.tachiyomi.data.track.TrackPreferences
1515
import eu.kanade.tachiyomi.extension.ExtensionManager
16+
import eu.kanade.tachiyomi.extension.util.TrustExtension
1617
import eu.kanade.tachiyomi.network.JavaScriptEngine
1718
import eu.kanade.tachiyomi.network.NetworkHelper
1819
import eu.kanade.tachiyomi.source.SourceManager
@@ -68,6 +69,8 @@ class AppModule(val app: Application) : InjektModule {
6869

6970
addSingletonFactory { MangaShortcutManager() }
7071

72+
addSingletonFactory { TrustExtension(get()) }
73+
7174
// Asynchronously init expensive components for a faster cold start
7275

7376
ContextCompat.getMainExecutor(app).execute {

‎app/src/main/java/eu/kanade/tachiyomi/Migrations.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,11 @@ object Migrations {
255255
} catch (_: Exception) {
256256
}
257257
}
258+
if (oldVersion < 111) {
259+
prefs.edit {
260+
remove("trusted_signatures")
261+
}
262+
}
258263

259264
return true
260265
}

‎app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
2020
/**
2121
* Version of the database.
2222
*/
23-
const val DATABASE_VERSION = 16
23+
const val DATABASE_VERSION = 17
2424
}
2525

2626
override fun onOpen(db: SupportSQLiteDatabase) {
@@ -112,6 +112,9 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
112112
if (oldVersion < 16) {
113113
db.execSQL(MangaTable.addUpdateStrategy)
114114
}
115+
if (oldVersion < 17) {
116+
db.execSQL(TrackTable.updateMangaUpdatesScore)
117+
}
115118
}
116119

117120
override fun onConfigure(db: SupportSQLiteDatabase) {

‎app/src/main/java/eu/kanade/tachiyomi/data/database/tables/TrackTable.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package eu.kanade.tachiyomi.data.database.tables
22

3+
import eu.kanade.tachiyomi.data.track.TrackManager
4+
35
object TrackTable {
46

57
const val TABLE = "manga_sync"
@@ -77,4 +79,12 @@ object TrackTable {
7779

7880
val dropTempTable: String
7981
get() = "DROP TABLE ${TABLE}_tmp"
82+
83+
val updateMangaUpdatesScore: String
84+
get() =
85+
"""
86+
UPDATE $TABLE
87+
SET $COL_SCORE = max($COL_SCORE, 0)
88+
WHERE $COL_SYNC_ID = ${TrackManager.MANGA_UPDATES};
89+
""".trimIndent()
8090
}

‎app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,10 @@ class PreferencesHelper(val context: Context) {
297297

298298
fun automaticExtUpdates() = flowPrefs.getBoolean(Keys.automaticExtUpdates, true)
299299

300-
fun installedExtensionsOrder() = flowPrefs.getInt(Keys.installedExtensionsOrder, InstalledExtensionsOrder.Name.value)
300+
fun extensionRepos() = flowPrefs.getStringSet("extension_repos", emptySet())
301+
302+
fun installedExtensionsOrder() =
303+
flowPrefs.getInt(Keys.installedExtensionsOrder, InstalledExtensionsOrder.Name.value)
301304

302305
fun migrationSourceOrder() = flowPrefs.getInt("migration_source_order", Values.MigrationSourceOrder.Alphabetically.value)
303306

@@ -344,7 +347,7 @@ class PreferencesHelper(val context: Context) {
344347

345348
fun migrateFlags() = flowPrefs.getInt("migrate_flags", Int.MAX_VALUE)
346349

347-
fun trustedSignatures() = flowPrefs.getStringSet("trusted_signatures", emptySet())
350+
fun trustedExtensions() = flowPrefs.getStringSet("trusted_extensions", emptySet())
348351

349352
// using string instead of set so it is ordered
350353
fun migrationSources() = flowPrefs.getString("migrate_sources", "")

0 commit comments

Comments
 (0)