From 284c0664f65cca83ed23763acacd1a28471a385c Mon Sep 17 00:00:00 2001 From: Alexandre Roux D'Anzi Date: Tue, 27 Feb 2024 13:09:08 +0100 Subject: [PATCH 1/3] removing asn1c not existing in project anymore --- libs/lpac-jni/src/main/jni/Android.bp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libs/lpac-jni/src/main/jni/Android.bp b/libs/lpac-jni/src/main/jni/Android.bp index c710a16..ce622de 100644 --- a/libs/lpac-jni/src/main/jni/Android.bp +++ b/libs/lpac-jni/src/main/jni/Android.bp @@ -13,16 +13,6 @@ cc_library_static { ], } -cc_library_static { - name: "liblpac-asn1c", - defaults: ["lpac-jni-defaults"], - local_include_dirs: ["lpac/euicc/asn1c"], - cflags: ["-DHAVE_CONFIG_H"], - srcs: [ - "lpac/euicc/asn1c/asn1/*.c", - ], -} - cc_library_static { name: "liblpac-euicc", defaults: ["lpac-jni-defaults"], @@ -30,7 +20,6 @@ cc_library_static { "lpac/euicc/*.c", ], static_libs: [ - "liblpac-asn1c", "liblpac-cjson", ], } @@ -44,7 +33,6 @@ cc_library_shared { ], static_libs: [ "liblpac-euicc", - "liblpac-asn1c", "liblpac-cjson", ], shared_libs: ["liblog"], -- 2.45.3 From 655eb5cf52d05e5b44cd1d1c173b03a62b841ba5 Mon Sep 17 00:00:00 2001 From: Alexandre Roux D'Anzi Date: Tue, 27 Feb 2024 13:09:35 +0100 Subject: [PATCH 2/3] fixing syntax not existing in older kotlin --- .../main/java/im/angry/openeuicc/core/EuiccChannelManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt b/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt index 23c21b9..313ef21 100644 --- a/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt +++ b/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt @@ -29,7 +29,7 @@ open class EuiccChannelManager(protected val context: Context) { } protected open val uiccCards: Collection - get() = (0.. Date: Tue, 27 Feb 2024 13:09:54 +0100 Subject: [PATCH 3/3] fixing bad override --- .../main/java/im/angry/openeuicc/ui/NotificationsActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt index 87c5ba3..66929c3 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt @@ -59,7 +59,7 @@ class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker { refresh() } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { + override fun onCreateOptionsMenu(menu: Menu): Boolean { super.onCreateOptionsMenu(menu) menuInflater.inflate(R.menu.activity_notifications, menu) return true -- 2.45.3