kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(deps): upgrade to JGit 4.5.7.201904151645-r

Browse source 
Currently requires deleting and re-cloning the repository to properly
detect symlink support, this will be fixed in the future to auto-detect
on existing repositories as well.

Fixes #2594
Fixes #2396
Fixes #636
Fixes #387
Fixes #98
This commit is contained in:
Harsh Shandilya 2023-11-27 11:34:12 +05:30
parent f823004318
commit a9b0112279
No known key found for this signature in database
15 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/lint-baseline.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
<issue <issue
id="StopShip" id="StopShip"
@ -26,6 +26,13 @@
file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.75/5adfef8a71a0933454739264b56283cc73dd2383/bcpkix-jdk18on-1.75.jar"/> file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.75/5adfef8a71a0933454739264b56283cc73dd2383/bcpkix-jdk18on-1.75.jar"/>
</issue> </issue>
<issue
id="InvalidPackage"
message="Invalid package reference in org.eclipse.jgit:org.eclipse.jgit; not included in Android: `javax.xml.bind`. Referenced from `org.eclipse.jgit.transport.WalkEncryption.SymmetricEncryption`.">
<location
file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.eclipse.jgit/org.eclipse.jgit/4.5.7.201904151645-r/e84008db495a7f48d65fb09afe53279b0df68c80/org.eclipse.jgit-4.5.7.201904151645-r.jar"/>
</issue>
<issue <issue
id="DenyListedApi" id="DenyListedApi"
message="Use Context#getDrawableCompat() instead" message="Use Context#getDrawableCompat() instead"

1
app/proguard-rules.pro vendored
View file

@ -8,6 +8,7 @@
-dontwarn sun.misc.SignalHandler -dontwarn sun.misc.SignalHandler
-dontwarn java.lang.instrument.ClassFileTransformer -dontwarn java.lang.instrument.ClassFileTransformer
-dontwarn javax.servlet.ServletContextListener -dontwarn javax.servlet.ServletContextListener
-dontwarn javax.xml.bind.DatatypeConverter
# WhatTheStack # WhatTheStack
-keep class com.haroldadmin.whatthestack.WhatTheStackInitializer { -keep class com.haroldadmin.whatthestack.WhatTheStackInitializer {

2
app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt
View file

@ -133,7 +133,7 @@ object PasswordRepository {
/** Get the currently checked out branch. */ /** Get the currently checked out branch. */
fun getCurrentBranch(): String? { fun getCurrentBranch(): String? {
val repository = repository ?: return null val repository = repository ?: return null
val headRef = repository.getRef(Constants.HEAD) ?: return null val headRef = repository.findRef(Constants.HEAD) ?: return null
return if (headRef.isSymbolic) { return if (headRef.isSymbolic) {
val branchName = headRef.target.name val branchName = headRef.target.name
Repository.shortenRefName(branchName) Repository.shortenRefName(branchName)

2
app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt
View file

@ -158,7 +158,7 @@ class GitConfigActivity : BaseGitActivity() {
*/ */
private fun headStatusMsg(repo: Repository): String { private fun headStatusMsg(repo: Repository): String {
return runCatching { return runCatching {
val headRef = repo.getRef(Constants.HEAD) val headRef = repo.findRef(Constants.HEAD)
if (headRef.isSymbolic) { if (headRef.isSymbolic) {
val branchName = headRef.target.name val branchName = headRef.target.name
val shortBranchName = Repository.shortenRefName(branchName) val shortBranchName = Repository.shortenRefName(branchName)

2
autofill-parser/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
coroutine-utils/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
crypto/common/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
crypto/pgpainless/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
format/common/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
gradle/libs.versions.toml
View file

@ -80,7 +80,7 @@ thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.3.0"
thirdparty-flowbinding-android = { module = "io.github.reactivecircus.flowbinding:flowbinding-android", version.ref = "flowbinding" } thirdparty-flowbinding-android = { module = "io.github.reactivecircus.flowbinding:flowbinding-android", version.ref = "flowbinding" }
# JGit upgrades also raise its minimum Java runtime requirements that we cannot satisfy on Android # JGit upgrades also raise its minimum Java runtime requirements that we cannot satisfy on Android
# noinspection GradleDependency # noinspection GradleDependency
thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:4.0.0.201506090130-r" thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:4.5.7.201904151645-r"
thirdparty-kotlinResult = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlinResult" } thirdparty-kotlinResult = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlinResult" }
thirdparty-kotlinResult-coroutines = { module = "com.michael-bull.kotlin-result:kotlin-result-coroutines", version.ref = "kotlinResult" } thirdparty-kotlinResult-coroutines = { module = "com.michael-bull.kotlin-result:kotlin-result-coroutines", version.ref = "kotlinResult" }
thirdparty-leakcanary-plumber = "com.squareup.leakcanary:plumber-android-startup:2.12" thirdparty-leakcanary-plumber = "com.squareup.leakcanary:plumber-android-startup:2.12"

2
passgen/diceware/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
passgen/random/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
sentry-stub/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>

2
ssh/lint-baseline.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
<issue <issue
id="InvalidPackage" id="InvalidPackage"

2
ui/compose/lint-baseline.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05"> <issues format="6" by="lint 8.3.0-alpha14" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha14)" variant="all" version="8.3.0-alpha14">
</issues> </issues>