explicitly call mlkit initialize in case provider doesn't start

makeProjectGreatAgain · Aug 5, 2023 · 07efcb8 · 07efcb8
1 parent 927353e
commit 07efcb8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/AuthenticatorPro.Droid/Properties/AndroidManifest.xml b/AuthenticatorPro.Droid/Properties/AndroidManifest.xml
@@ -14,7 +14,10 @@
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
     <application android:allowBackup="false" android:label="@string/appName" android:icon="@mipmap/ic_launcher"
                  android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true"
-                 android:theme="@style/AppTheme"></application>
+                 android:theme="@style/AppTheme">
+        <provider android:name="com.google.mlkit.common.internal.MlKitInitProvider"
+                  android:authorities="me.jmh.authenticatorpro.mlkitinitprovider" tools:node="remove" />
+    </application>
     <supports-screens android:smallScreens="true" android:largeScreens="true" android:xlargeScreens="true"
                       android:normalScreens="true" android:anyDensity="true"/>
 </manifest>
diff --git a/AuthenticatorPro.Droid/src/Activity/ScanActivity.cs b/AuthenticatorPro.Droid/src/Activity/ScanActivity.cs
@@ -59,7 +59,7 @@ protected override async void OnCreate(Bundle savedInstanceState)
                 .SetBackpressureStrategy(ImageAnalysis.StrategyKeepOnlyLatest)
                 .Build();
 
-            var analyser = new MlKitQrCodeImageAnalyser();
+            var analyser = new MlKitQrCodeImageAnalyser(this);
             analyser.QrCodeScanned += OnQrCodeScanned;
             analysis.SetAnalyzer(ContextCompat.GetMainExecutor(this), analyser);
 #endif

diff --git a/AuthenticatorPro.Droid/src/QrCode/Analyser/MlKitQrCodeImageAnalyser.cs b/AuthenticatorPro.Droid/src/QrCode/Analyser/MlKitQrCodeImageAnalyser.cs
@@ -3,13 +3,16 @@
 
 #if !FDROID
 
+using Android.Content;
 using Android.Gms.Extensions;
 using Android.Runtime;
 using Android.Util;
 using AndroidX.Camera.Core;
+using Java.Lang;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Xamarin.Google.MLKit.Common;
 using Xamarin.Google.MLKit.Vision.BarCode;
 using Xamarin.Google.MLKit.Vision.Barcode.Common;
 using Xamarin.Google.MLKit.Vision.Common;
@@ -26,8 +29,17 @@ public class MlKitQrCodeImageAnalyser : Java.Lang.Object, ImageAnalysis.IAnalyze
         private long _lastScanMillis;
         private readonly IBarcodeScanner _barcodeScanner;
 
-        public MlKitQrCodeImageAnalyser()
+        public MlKitQrCodeImageAnalyser(Context context)
         {
+            try
+            {
+                MlKit.Initialize(context);
+            }
+            catch (IllegalStateException e)
+            {
+                Logger.Warn("MlKit already initialised", e);
+            }
+
             var options = new BarcodeScannerOptions.Builder()
                 .SetBarcodeFormats(Barcode.FormatQrCode)
                 .Build();

diff --git a/AuthenticatorPro.Droid/src/QrCode/Reader/MlKitQrCodeReader.cs b/AuthenticatorPro.Droid/src/QrCode/Reader/MlKitQrCodeReader.cs
@@ -6,13 +6,15 @@
 using Android.Content;
 using Android.Gms.Extensions;
 using Android.Runtime;
-using System;
+using Java.Lang;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Xamarin.Google.MLKit.Common;
 using Xamarin.Google.MLKit.Vision.BarCode;
 using Xamarin.Google.MLKit.Vision.Barcode.Common;
 using Xamarin.Google.MLKit.Vision.Common;
+using Exception = System.Exception;
 using Uri = Android.Net.Uri;
 
 namespace AuthenticatorPro.Droid.QrCode.Reader
@@ -21,6 +23,15 @@ public class MlKitQrCodeReader : IQrCodeReader
     {
         public async Task<string> ScanImageFromFileAsync(Context context, Uri uri)
         {
+            try
+            {
+                MlKit.Initialize(context);
+            }
+            catch (IllegalStateException e)
+            {
+                Logger.Warn("MlKit already initialised", e);
+            }
+
             InputImage image;
 
             try