From 8ee3c53492a75bf3606198c7e579babf59b3acdc Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 5 Mar 2024 20:07:49 -0500 Subject: [PATCH 1/3] buildSrc: Use HEAD rev count as version code In Actions, we do not always have a checkout of the master branch. This only applies to release builds anyway. For debug builds, we always use the timestamp. --- buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt index 2c77fd3..24f0235 100644 --- a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt +++ b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt @@ -12,7 +12,7 @@ val Project.gitVersionCode: Int try { val stdout = ByteArrayOutputStream() exec { - commandLine("git", "rev-list", "--first-parent", "--count", "master") + commandLine("git", "rev-list", "--first-parent", "--count", "HEAD") standardOutput = stdout } stdout.toString("utf-8").trim('\n').toInt() From 124d1690abacfcf728bf7c160798f2721313c2e6 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 5 Mar 2024 20:12:19 -0500 Subject: [PATCH 2/3] fix: Clear status icon when compat check items are recycled --- .../im/angry/openeuicc/ui/CompatibilityCheckActivity.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt b/app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt index 0eb433a..b7c8cf8 100644 --- a/app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt +++ b/app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt @@ -7,6 +7,7 @@ import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.children import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager @@ -52,11 +53,16 @@ class CompatibilityCheckActivity: AppCompatActivity() { inner class ViewHolder(private val root: View): RecyclerView.ViewHolder(root) { private val titleView: TextView = root.findViewById(R.id.compatibility_check_title) private val descView: TextView = root.findViewById(R.id.compatibility_check_desc) + private val statusContainer: ViewGroup = root.findViewById(R.id.compatibility_check_status_container) fun bindItem(item: CompatibilityCheck) { titleView.text = item.title descView.text = item.description + statusContainer.children.forEach { + it.visibility = View.GONE + } + when (item.state) { CompatibilityCheck.State.SUCCESS -> { root.findViewById(R.id.compatibility_check_checkmark).visibility = View.VISIBLE From 348395c48da26aae77f4cd87aff3b96dc57fa866 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Tue, 5 Mar 2024 20:14:21 -0500 Subject: [PATCH 3/3] chore: Bump lpac --- libs/lpac-jni/src/main/jni/lpac | 2 +- libs/lpac-jni/src/main/jni/lpac-jni/lpac-jni.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/lpac-jni/src/main/jni/lpac b/libs/lpac-jni/src/main/jni/lpac index 47f44f9..dc09c3e 160000 --- a/libs/lpac-jni/src/main/jni/lpac +++ b/libs/lpac-jni/src/main/jni/lpac @@ -1 +1 @@ -Subproject commit 47f44f911099bffdbdb4854500578ba18ab19d06 +Subproject commit dc09c3e668fc191694e73fede255a7a0a26f4988 diff --git a/libs/lpac-jni/src/main/jni/lpac-jni/lpac-jni.c b/libs/lpac-jni/src/main/jni/lpac-jni/lpac-jni.c index 6cdda00..503f816 100644 --- a/libs/lpac-jni/src/main/jni/lpac-jni/lpac-jni.c +++ b/libs/lpac-jni/src/main/jni/lpac-jni/lpac-jni.c @@ -236,7 +236,7 @@ Java_net_typeblog_lpac_1jni_LpacJni_es10cGetProfilesInfo(JNIEnv *env, jobject th (*env)->DeleteLocalRef(env, jinfo); }); - es10c_profile_info_free_all(info); + es10c_profile_info_list_free_all(info); return ret; }