Remove redundant mlkit scanner

Author: Novfensec

client/buildozer.spec

@@ -214,7 +214,7 @@ android.add_src = ./src
 #android.add_resources =
 
 # (list) Gradle dependencies to add
-android.gradle_dependencies = com.google.mlkit:barcode-scanning:17.2.0, androidx.camera:camera-core:1.1.0, androidx.camera:camera-camera2:1.1.0, androidx.camera:camera-lifecycle:1.1.0, androidx.camera:camera-view:1.0.0-alpha31, androidx.appcompat:appcompat:1.6.1, androidx.constraintlayout:constraintlayout:2.1.4
+android.gradle_dependencies =  androidx.appcompat:appcompat:1.6.1
 
 # (bool) Enable AndroidX support. Enable when 'android.gradle_dependencies'
 # contains an 'androidx' package, or any package from Kotlin source.
@@ -229,7 +229,7 @@ android.enable_androidx = True
 # (list) Gradle repositories to add {can be necessary for some android.gradle_dependencies}
 # please enclose in double quotes 
 # e.g. android.gradle_repositories = "maven { url 'https://repo.spring.io/release' }"
-android.add_gradle_repositories = "maven { url 'https://maven.google.com' }", "mavenCentral()"
+# android.add_gradle_repositories = "maven { url 'https://maven.google.com' }", "mavenCentral()"
 
 # (list) packaging options to add
 # see https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/dsl/PackagingOptions
@@ -273,7 +273,7 @@ android.manifest.launch_mode = standard
 android.wakelock = True
 
 # (list) Android application meta-data to set (key=value format)
-android.meta_data = com.google.mlkit.vision.DEPENDENCIES=barcode
+# android.meta_data = com.google.mlkit.vision.DEPENDENCIES=barcode
 
 # (list) Android library project to add (will be added in the
 # project.properties automatically.)

client/main.py

@@ -67,8 +67,9 @@ def on_resume(self):
         return super().on_resume()
 
     def start_scan(self, *args) -> None:
-        if platform == "android":
-            scan_qr_and_get_url(self.launch)
+        # if platform == "android":
+        #     scan_qr_and_get_url(self.launch)
+        pass
 
     def fetch_config(self, server_url: str, *args) -> dict | bool:
         url = f"{server_url}/config.toml"

client/src/org/kvdeveloper/client/QRScannerActivity.java

@@ -1,88 +1,14 @@
 package org.kvdeveloper.client;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.ImageAnalysis;
-import androidx.camera.core.ImageProxy;
-import androidx.camera.lifecycle.ProcessCameraProvider;
-import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.google.mlkit.vision.barcode.common.Barcode;
-import com.google.mlkit.vision.barcode.BarcodeScanner;
-import com.google.mlkit.vision.barcode.BarcodeScanning;
-import com.google.mlkit.vision.common.InputImage;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public class QRScannerActivity extends AppCompatActivity {
-    private ExecutorService cameraExecutor;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        cameraExecutor = Executors.newSingleThreadExecutor();
-
-        startCamera();  // Initialize CameraX and MLKit here
-    }
-
-    private void startCamera() {
-        ProcessCameraProvider.getInstance(this).addListener(() -> {
-            try {
-                ProcessCameraProvider cameraProvider = ProcessCameraProvider.getInstance(this).get();
-
-                ImageAnalysis imageAnalysis = new ImageAnalysis.Builder()
-                        .build();
-
-                BarcodeScanner scanner = BarcodeScanning.getClient();
-
-                imageAnalysis.setAnalyzer(cameraExecutor, image -> {
-                    scanImage(scanner, image);
-                });
-
-                cameraProvider.unbindAll();
-                cameraProvider.bindToLifecycle(
-                        this,
-                        CameraSelector.DEFAULT_BACK_CAMERA,
-                        imageAnalysis
-                );
-
-            } catch (Exception e) {
-                Log.e("QRScanner", "Camera start failed", e);
-            }
-        }, ContextCompat.getMainExecutor(this));
-    }
-
-    private void scanImage(BarcodeScanner scanner, ImageProxy imageProxy) {
-        @SuppressWarnings("UnsafeOptInUsageError")
-        InputImage image = InputImage.fromMediaImage(imageProxy.getImage(), imageProxy.getImageInfo().getRotationDegrees());
-
-        scanner.process(image)
-                .addOnSuccessListener(barcodes -> {
-                    for (Barcode barcode : barcodes) {
-                        String rawValue = barcode.getRawValue();
-                        if (rawValue != null) {
-                            Intent resultIntent = new Intent();
-                            resultIntent.putExtra("qrcode_url", rawValue);
-                            setResult(Activity.RESULT_OK, resultIntent);
-                            finish();
-                        }
-                    }
-                })
-                .addOnFailureListener(e -> Log.e("QRScanner", "Scan failed", e))
-                .addOnCompleteListener(task -> imageProxy.close());
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        cameraExecutor.shutdown();
     }
 }