From 469b1a86275bade42664fb7afb70d889d41f8497 Mon Sep 17 00:00:00 2001
From: Tsanie Lily <tsorgy@gmail.com>
Date: Mon, 28 Mar 2022 14:46:16 +0800
Subject: [PATCH] tiny fix

---
 Billing.Shared/Helper.cs                              | 11 +++--------
 Billing.Shared/LocationExtension.cs                   |  2 +-
 Billing.Shared/Store/StoreHelper.cs                   |  2 +-
 Billing/Billing.Android/Billing.Android.csproj        |  6 +++---
 .../Billing.Android/Properties/AndroidManifest.xml    |  2 +-
 .../Billing.Android/Resources/Resource.designer.cs    |  2 +-
 Billing/Billing.iOS/Info.plist                        |  4 ++--
 7 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Billing.Shared/Helper.cs b/Billing.Shared/Helper.cs
index 69223a3..de46c2a 100644
--- a/Billing.Shared/Helper.cs
+++ b/Billing.Shared/Helper.cs
@@ -149,18 +149,13 @@ namespace Billing
         }
     }
 
-    public class AsyncLazy<T>
+    public class AsyncLazy<T> : Lazy<Task<T>>
     {
-        private readonly Lazy<Task<T>> instance;
-
-        public AsyncLazy(Func<Task<T>> factory)
-        {
-            instance = new Lazy<Task<T>>(() => Task.Run(factory));
-        }
+        public AsyncLazy(Func<Task<T>> factory) : base(() => Task.Run(factory)) { }
 
         public TaskAwaiter<T> GetAwaiter()
         {
-            return instance.Value.GetAwaiter();
+            return Value.GetAwaiter();
         }
     }
 }
\ No newline at end of file
diff --git a/Billing.Shared/LocationExtension.cs b/Billing.Shared/LocationExtension.cs
index 0913923..063b61a 100644
--- a/Billing.Shared/LocationExtension.cs
+++ b/Billing.Shared/LocationExtension.cs
@@ -15,7 +15,7 @@ namespace Billing
 
         public static (double longitude, double latitude) Gcj02ToWgs84(this (double lon, double lat) position)
         {
-            var (longitude, latitude) = Transform(position);
+            (double longitude, double latitude) = Transform(position);
             longitude = position.lon * 2d - longitude;
             latitude = position.lat * 2d - latitude;
             return (longitude, latitude);
diff --git a/Billing.Shared/Store/StoreHelper.cs b/Billing.Shared/Store/StoreHelper.cs
index c115d50..265b89c 100644
--- a/Billing.Shared/Store/StoreHelper.cs
+++ b/Billing.Shared/Store/StoreHelper.cs
@@ -76,7 +76,7 @@ namespace Billing.Store
             }
             try
             {
-                var count = await database.ExecuteScalarAsync<int>("SELECT COUNT(Id) FROM [Category]");
+                var count = await database.ExecuteScalarAsync<int>("SELECT COUNT(Id) FROM [Account]");
                 if (count <= 0)
                 {
                     await database.InsertAsync(new Account { Name = Resource.Cash, Icon = "wallet" });
diff --git a/Billing/Billing.Android/Billing.Android.csproj b/Billing/Billing.Android/Billing.Android.csproj
index 8b5315f..ea9e04b 100644
--- a/Billing/Billing.Android/Billing.Android.csproj
+++ b/Billing/Billing.Android/Billing.Android.csproj
@@ -50,11 +50,11 @@
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AotAssemblies>true</AotAssemblies>
-    <EnableLLVM>true</EnableLLVM>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
     <BundleAssemblies>true</BundleAssemblies>
-    <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
+    <AndroidSupportedAbis>x86_64;arm64-v8a</AndroidSupportedAbis>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
     <AndroidLinkTool>r8</AndroidLinkTool>
diff --git a/Billing/Billing.Android/Properties/AndroidManifest.xml b/Billing/Billing.Android/Properties/AndroidManifest.xml
index fdd0b61..9de3091 100644
--- a/Billing/Billing.Android/Properties/AndroidManifest.xml
+++ b/Billing/Billing.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.2.318" package="org.tsanie.billing" android:installLocation="auto" android:versionCode="18">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.2.328" package="org.tsanie.billing" android:installLocation="auto" android:versionCode="20">
 	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="30" />
 	<application android:label="@string/applabel" android:theme="@style/MainTheme" android:requestLegacyExternalStorage="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Billing/Billing.Android/Resources/Resource.designer.cs b/Billing/Billing.Android/Resources/Resource.designer.cs
index 5168da5..83bb8f4 100644
--- a/Billing/Billing.Android/Resources/Resource.designer.cs
+++ b/Billing/Billing.Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@ namespace Billing.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.0.155")]
 	public partial class Resource
 	{
 		
diff --git a/Billing/Billing.iOS/Info.plist b/Billing/Billing.iOS/Info.plist
index 4768c4e..89eeacc 100644
--- a/Billing/Billing.iOS/Info.plist
+++ b/Billing/Billing.iOS/Info.plist
@@ -80,9 +80,9 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>19</string>
+	<string>20</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.318</string>
+	<string>1.2.328</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>mailto</string>