From a9b0112279bca0f19a2d8756d2fa4498936660dd Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Mon, 27 Nov 2023 11:34:12 +0530
Subject: fix(deps): upgrade to JGit 4.5.7.201904151645-r

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
---
 app/lint-baseline.xml                                            | 9 ++++++++-
 app/proguard-rules.pro                                           | 1 +
 .../main/java/app/passwordstore/data/repo/PasswordRepository.kt  | 2 +-
 .../java/app/passwordstore/ui/git/config/GitConfigActivity.kt    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index b0702655..700a3533 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?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
         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"/>
     </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
         id="DenyListedApi"
         message="Use Context#getDrawableCompat() instead"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 6dd3b79e..8e75c760 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -8,6 +8,7 @@
 -dontwarn sun.misc.SignalHandler
 -dontwarn java.lang.instrument.ClassFileTransformer
 -dontwarn javax.servlet.ServletContextListener
+-dontwarn javax.xml.bind.DatatypeConverter
 
 # WhatTheStack
 -keep class com.haroldadmin.whatthestack.WhatTheStackInitializer {
diff --git a/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt
index 454054cf..39c6b384 100644
--- a/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt
+++ b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt
@@ -133,7 +133,7 @@ object PasswordRepository {
   /** Get the currently checked out branch. */
   fun getCurrentBranch(): String? {
     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) {
       val branchName = headRef.target.name
       Repository.shortenRefName(branchName)
diff --git a/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt
index 1411389f..d7584e69 100644
--- a/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt
@@ -158,7 +158,7 @@ class GitConfigActivity : BaseGitActivity() {
    */
   private fun headStatusMsg(repo: Repository): String {
     return runCatching {
-        val headRef = repo.getRef(Constants.HEAD)
+        val headRef = repo.findRef(Constants.HEAD)
         if (headRef.isSymbolic) {
           val branchName = headRef.target.name
           val shortBranchName = Repository.shortenRefName(branchName)
-- 
cgit v1.2.3