blutter: better handle APK files

AbhiTheModder · AbhiTheModder · commit 21630b1620ca · 2025-06-01T04:30:24.000+05:30
*android:  ktlint for kotlin files
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -6,6 +6,8 @@ plugins {
     id("kotlin-android")
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id("dev.flutter.flutter-gradle-plugin")
+    // kt lint
+    id("org.jmailen.kotlinter")
 }
 
 val keystoreProperties = Properties()
@@ -45,10 +47,7 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "org.revengi.app"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
@@ -57,8 +56,6 @@ android {
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             // signingConfig = signingConfigs.getByName("debug")
             signingConfig = signingConfigs.getByName("release")
         }
diff --git a/android/app/src/main/kotlin/org/revengi/app/MainActivity.kt b/android/app/src/main/kotlin/org/revengi/app/MainActivity.kt
@@ -1,33 +1,37 @@
 package org.revengi.app
 
-import io.flutter.embedding.android.FlutterActivity
 import android.os.Build
-import androidx.annotation.NonNull
+import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
 
 class MainActivity : FlutterActivity() {
-    private val CHANNEL = "flutter.native/helper"
+    private val myChannel = "flutter.native/helper"
 
-    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
-            if (call.method == "getDeviceInfo") {
-                val deviceInfo: HashMap<String, String> = getDeviceInfo()
-                if (deviceInfo.isNotEmpty()) {
-                    result.success(deviceInfo)
-                } else {
-                    result.error("UNAVAILABLE", "Device info not available.", null)
+        MethodChannel(
+            flutterEngine.dartExecutor.binaryMessenger,
+            myChannel,
+        ).setMethodCallHandler { call, result ->
+            when (call.method) {
+                "getDeviceInfo" -> {
+                    val deviceInfo: HashMap<String, String> = getDeviceInfo()
+                    if (deviceInfo.isNotEmpty()) {
+                        result.success(deviceInfo)
+                    } else {
+                        result.error("UNAVAILABLE", "Device info not available.", null)
+                    }
                 }
-            } else {
-                result.notImplemented()
+
+                else -> result.notImplemented()
             }
         }
     }
 
     private fun getDeviceInfo(): HashMap<String, String> {
         val deviceInfo = HashMap<String, String>()
-        deviceInfo["version"] = System.getProperty("os.version").toString()
+        deviceInfo["version"] = System.getProperty("os.version")!!.toString()
         deviceInfo["device"] = Build.DEVICE
         deviceInfo["model"] = Build.MODEL
         deviceInfo["product"] = Build.PRODUCT
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
@@ -20,6 +20,7 @@ plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.7.0" apply false
     id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+    id("org.jmailen.kotlinter") version "5.1.0" apply false
 }
 
 include(":app")
diff --git a/lib/screens/blutter/blutter_io.dart b/lib/screens/blutter/blutter_io.dart
@@ -49,12 +49,16 @@ class _BlutterAnalysisScreenState extends State<BlutterAnalysisScreen> {
     final Directory directory = Directory.systemTemp;
     final apkPath = _apkFile!.path;
     final zipFile = File(apkPath);
+    String fileEnd = "arm64-v8a/libapp.so";
+    if (apkPath.split(Platform.pathSeparator).last.endsWith('.zip')) {
+      fileEnd = "libapp.so";
+    }
 
     try {
       final archive = ZipDecoder().decodeBytes(await zipFile.readAsBytes());
 
       for (final file in archive) {
-        if (file.isFile && file.name.endsWith('libapp.so')) {
+        if (file.isFile && file.name.endsWith(fileEnd)) {
           final data = file.content as List<int>;
           _libappFile = File('${directory.path}/libapp.so')
             ..writeAsBytesSync(data);
@@ -226,6 +230,30 @@ class _BlutterAnalysisScreenState extends State<BlutterAnalysisScreen> {
                       ),
                     ),
                     const SizedBox(height: 16),
+                    RichText(
+                      text: TextSpan(
+                        children: [
+                          TextSpan(
+                            text: 'Note: ',
+                            style: const TextStyle(
+                              fontSize: 14,
+                              color: Colors.orange,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          TextSpan(
+                            text:
+                                '\nAPK: The app will directly handle APK files.\n'
+                                '\nZIP: Ensure ZIP files contain only the `libapp.so` for arm64 architecture. Failure to comply may result in errors.',
+                            style: const TextStyle(
+                              fontSize: 14,
+                              color: Colors.grey,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    const SizedBox(height: 16),
                     SizedBox(
                       width: double.infinity,
                       child: ElevatedButton.icon(
diff --git a/lib/screens/blutter/blutter_web.dart b/lib/screens/blutter/blutter_web.dart
@@ -50,11 +50,15 @@ class _BlutterAnalysisScreenState extends State<BlutterAnalysisScreen> {
 
   Future<void> _extractFiles() async {
     if (_fileBytes.isEmpty) return;
+    String fileEnd = "arm64-v8a/libapp.so";
+    if (_fileName!.endsWith('.zip')) {
+      fileEnd = "libapp.so";
+    }
     try {
       final archive = ZipDecoder().decodeBytes(_fileBytes);
 
       for (final file in archive) {
-        if (file.isFile && file.name.endsWith('libapp.so')) {
+        if (file.isFile && file.name.endsWith(fileEnd)) {
           _libappBytes = file.content as List<int>;
         } else if (file.isFile && file.name.endsWith('libflutter.so')) {
           _libflutterBytes = file.content as List<int>;
@@ -216,6 +220,29 @@ class _BlutterAnalysisScreenState extends State<BlutterAnalysisScreen> {
                       ),
                     ),
                     const SizedBox(height: 16),
+                    RichText(
+                      text: TextSpan(
+                        children: [
+                          TextSpan(
+                            text: 'Note: ',
+                            style: const TextStyle(
+                              fontSize: 14,
+                              color: Colors.orange,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                          TextSpan(
+                            text:
+                                '\nAPK: The app will directly handle APK files.\n'
+                                '\nZIP: Ensure ZIP files contain only the `libapp.so` for arm64 architecture. Failure to comply may result in errors.',
+                            style: const TextStyle(
+                              fontSize: 14,
+                              color: Colors.grey,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
                     SizedBox(
                       width: double.infinity,
                       child: ElevatedButton.icon(

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ plugins {`
`20`	`20`	`id("dev.flutter.flutter-plugin-loader") version "1.0.0"`
`21`	`21`	`id("com.android.application") version "8.7.0" apply false`
`22`	`22`	`id("org.jetbrains.kotlin.android") version "1.8.22" apply false`
	`23`	`+ id("org.jmailen.kotlinter") version "5.1.0" apply false`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`include(":app")`