feat: kgit migration

app/build.gradle.kts

@@ -30,11 +30,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     buildFeatures {
         compose = true
@@ -52,7 +52,7 @@ android {
 dependencies {
     implementation(libs.security.crypto)
     implementation(libs.squareup.okhttp3)
-    implementation(libs.eclipse.jgit)
+    implementation(libs.kgit)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)

app/src/main/java/com/viscouspot/gitsync/MainActivity.kt

@@ -165,6 +165,7 @@ class MainActivity : AppCompatActivity() {
             refreshAuthButton()
 
             CloneRepoFragment(settingsManager, gitManager) {
+                gitDirPath.setText(settingsManager.getGitDirPath())
                 refreshGitRepo()
             }.show(supportFragmentManager, "Select a repository")
         }
@@ -282,7 +283,7 @@ class MainActivity : AppCompatActivity() {
 
         }
 
-        gitDirPath.setOnFocusChangeListener { v, hasFocus ->
+        gitDirPath.setOnFocusChangeListener { _, hasFocus ->
             if (!hasFocus) {
                 settingsManager.setGitDirPath(gitDirPath.text.toString())
                 refreshGitRepo()
@@ -452,8 +453,8 @@ class MainActivity : AppCompatActivity() {
     private fun refreshGitRepo() {
         var repoName = ""
 
-        val gitConfigFile = File("${gitDirPath.text}/.git/config")
         val gitPathEmpty = gitDirPath.text.toString().trim() == ""
+        val gitConfigFile = File("${gitDirPath.text}/.git/config")
         if (!gitPathEmpty && gitConfigFile.exists()) {
             val fileContents = gitConfigFile.readText()
 
@@ -473,6 +474,7 @@ class MainActivity : AppCompatActivity() {
             cloneRepoButton.visibility = View.VISIBLE
             cloneRepoButton.setOnClickListener {
                 CloneRepoFragment(settingsManager, gitManager) {
+                    gitDirPath.setText(settingsManager.getGitDirPath())
                     refreshGitRepo()
                 }.show(supportFragmentManager, getString(R.string.clone_repo))
             }

app/src/main/java/com/viscouspot/gitsync/ui/fragment/CloneRepoFragment.kt

@@ -67,7 +67,7 @@ class CloneRepoFragment(
 
         gitManager.getRepos(settingsManager.getGitAuthCredentials().second) {
             repoList.addAll(it)
-            requireActivity()?.runOnUiThread {
+            requireActivity().runOnUiThread {
                 adapter.notifyDataSetChanged()
             }
         }
@@ -125,7 +125,7 @@ class CloneRepoFragment(
                 callback = ::localDirCallback
                 dirSelectionLauncher.launch(null)
             }
-            .setNegativeButton(android.R.string.no, null)
+            .setNegativeButton(android.R.string.cancel, null)
             .show()
     }
 

app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt

@@ -6,6 +6,7 @@ import android.net.Uri
 import android.os.Looper
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import com.github.syari.kgit.KGit
 import com.viscouspot.gitsync.Secrets
 import com.viscouspot.gitsync.ui.adapter.Commit
 import com.viscouspot.gitsync.util.Logger.log
@@ -19,13 +20,10 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.diff.DiffFormatter
 import org.eclipse.jgit.internal.storage.file.FileRepository
-import org.eclipse.jgit.lib.Repository
 import org.eclipse.jgit.revwalk.RevSort
 import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.revwalk.filter.RevFilter
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
 import org.eclipse.jgit.util.io.DisabledOutputStream
 import org.json.JSONArray
@@ -70,7 +68,7 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
 
             override fun onResponse(call: Call, response: Response) {
                 log("GithubAuthCredentials", "Auth Token Obtained")
-                val authToken = JSONObject(response.body?.string()).getString("access_token")
+                val authToken = JSONObject(response.body?.string() ?: "").getString("access_token")
 
                 getGithubProfile(authToken, {
                     setCallback.invoke(it, authToken)
@@ -139,11 +137,11 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
         CoroutineScope(Dispatchers.IO).launch {
             try {
                 log("CloneRepo", "Cloning Repo")
-                Git.cloneRepository()
-                    .setURI(repoUrl)
-                    .setDirectory(File(storageDir))
-                    .setCredentialsProvider(UsernamePasswordCredentialsProvider(username, token))
-                    .call()
+                KGit.cloneRepository {
+                    setURI(repoUrl)
+                    setDirectory(File(storageDir))
+                    setCredentialsProvider(UsernamePasswordCredentialsProvider(username, token))
+                }
 
                 log("CloneRepo", "Repository cloned successfully")
                 withContext(Dispatchers.Main) {
@@ -168,19 +166,21 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
             var returnResult: Boolean? = false
             log("PullFromRepo", "Getting local directory")
             val repo = FileRepository("$storageDir/.git")
-            val git = Git(repo)
+            val git = KGit(repo)
             val cp = UsernamePasswordCredentialsProvider(username, token)
 
             log("PullFromRepo", "Fetching changes")
-            val fetchResult = git.fetch().setCredentialsProvider(cp).call()
+            val fetchResult = git.fetch {
+                setCredentialsProvider(cp)
+            }
 
             if (!fetchResult.trackingRefUpdates.isEmpty()) {
                 log("PullFromRepo", "Pulling changes")
                 onSync.invoke()
-                val result = git.pull()
-                    .setCredentialsProvider(cp)
-                    .setRemote("origin")
-                    .call()
+                val result = git.pull {
+                    setCredentialsProvider(cp)
+                    remote = "origin"
+                }
                 if (result.isSuccessful()) {
                     returnResult = true
                 } else {
@@ -204,31 +204,36 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
             log("PushToRepo", "Getting local directory")
 
             val repo = FileRepository("$storageDir/.git")
-            val git = Git(repo)
+            val git = KGit(repo)
 
             logStatus(git)
-            val status = git.status().call()
+            val status = git.status()
             if (status.uncommittedChanges.isNotEmpty() || status.untracked.isNotEmpty()) {
                 onSync.invoke()
                 log("PushToRepo", "Adding Files to Stage")
-                git.add().addFilepattern(".").call();
-                git.add().addFilepattern(".").setUpdate(true).call();
+                git.add {
+                    addFilepattern(".")
+                }
+                git.add {
+                    addFilepattern(".")
+                    isUpdate = true
+                }
 
                 log("PushToRepo", "Getting current time")
                 val currentDateTime = LocalDateTime.now()
                 val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
 
                 log("PushToRepo", "Committing changes")
-                git.commit()
-                    .setCommitter(username, "")
-                    .setMessage("Last Sync: ${currentDateTime.format(formatter)} (Mobile)")
-                    .call()
+                git.commit {
+                    setCommitter(username, "")
+                    message = "Last Sync: ${currentDateTime.format(formatter)} (Mobile)"
+                }
 
                 log("PushToRepo", "Pushing changes")
-                git.push()
-                    .setCredentialsProvider(UsernamePasswordCredentialsProvider(username, token))
-                    .setRemote(repoUrl)
-                    .call()
+                git.push {
+                    setCredentialsProvider(UsernamePasswordCredentialsProvider(username, token))
+                    remote = repoUrl
+                }
 
                 if (Looper.myLooper() == null) {
                     Looper.prepare()
@@ -248,8 +253,8 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
         return null
     }
 
-    private fun logStatus(git: Git) {
-        val status = git.status().call()
+    private fun logStatus(git: KGit) {
+        val status = git.status()
         log("GitStatus.HasUncommittedChanges", status.hasUncommittedChanges().toString())
         log("GitStatus.Missing", status.missing.toString())
         log("GitStatus.Modified", status.modified.toString())
@@ -272,7 +277,6 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
             val head = repo.resolve("refs/heads/master")
             revWalk.markStart(revWalk.parseCommit(head))
             revWalk.sort(RevSort.COMMIT_TIME_DESC)
-            revWalk.setRevFilter(RevFilter.NO_MERGES)
 
             val commits = mutableListOf<Commit>()
             var count = 0
@@ -319,7 +323,7 @@ class GitManager(private val context: Context, private val activity: AppCompatAc
         return listOf()
     }
 
-    private fun closeRepo(repo: Repository) {
+    private fun closeRepo(repo: FileRepository) {
         repo.close()
         val lockFile = File(repo.directory, "index.lock")
         if (lockFile.exists()) lockFile.delete()

app/src/main/java/com/viscouspot/gitsync/util/Logger.kt

@@ -3,13 +3,16 @@ package com.viscouspot.gitsync.util
 import android.util.Log
 import java.io.PrintWriter
 import java.io.StringWriter
+import kotlin.system.exitProcess
 
 object Logger {
     fun log(type: String, e: Exception) {
         val sw = StringWriter()
         val pw = PrintWriter(sw)
         e.printStackTrace(pw)
         log(type, "Error: $sw")
+
+        exitProcess(0)
     }
 
     fun log(type: String, message: String) {

app/src/main/java/com/viscouspot/gitsync/util/SettingsManager.kt

@@ -61,7 +61,7 @@ class SettingsManager internal constructor(context: Context) {
     }
 
     fun getApplicationObserverEnabled(): Boolean {
-        return settingsSharedPref.getBoolean("applicationObserverEnabled", false)!!
+        return settingsSharedPref.getBoolean("applicationObserverEnabled", false)
     }
 
     fun setApplicationObserverEnabled(enabled: Boolean) {
@@ -83,7 +83,7 @@ class SettingsManager internal constructor(context: Context) {
     }
 
     fun getSyncOnAppOpened(): Boolean {
-        return settingsSharedPref.getBoolean("syncOnAppOpened", false)!!
+        return settingsSharedPref.getBoolean("syncOnAppOpened", false)
     }
 
     fun setSyncOnAppOpened(enabled: Boolean) {
@@ -94,7 +94,7 @@ class SettingsManager internal constructor(context: Context) {
     }
 
     fun getSyncOnAppClosed(): Boolean {
-        return settingsSharedPref.getBoolean("syncOnAppClosed", false)!!
+        return settingsSharedPref.getBoolean("syncOnAppClosed", false)
     }
 
     fun setSyncOnAppClosed(enabled: Boolean) {

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 agp = "8.3.0"
 kotlin = "1.9.0"
 coreKtx = "1.13.1"
-jgit = "3.7.1.201504261725-r"
+kgit = "1.0.6"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
@@ -16,7 +16,7 @@ securityCryptoKtx = "1.1.0-alpha06"
 [libraries]
 security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "securityCryptoKtx" }
 squareup-okhttp3 = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
-eclipse-jgit = { group = "org.eclipse.jgit", name = "org.eclipse.jgit", version.ref = "jgit" }
+kgit = { group = "com.github.sya-ri", name = "kgit", version.ref = "kgit" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }