use xamarin essentials + readme

AuthenticatorPro/.editorconfig

@@ -1,4 +1,3 @@
-# Rules in this file were initially inferred by Visual Studio IntelliCode from the C:\Development\ProAuth\ProAuth\ codebase based on best match to current usage at 23/08/2018
 # You can modify the rules from these initially generated values to suit your own policies
 # You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
 [*.cs]

AuthenticatorPro/AuthenticatorPro.csproj

@@ -61,12 +61,12 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>Full</AndroidLinkMode>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidSupportedAbis>armeabi;armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
-    <AotAssemblies>true</AotAssemblies>
-    <EnableLLVM>true</EnableLLVM>
+    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
+    <AotAssemblies>false</AotAssemblies>
+    <EnableLLVM>false</EnableLLVM>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <EnableProguard>false</EnableProguard>
-    <BundleAssemblies>true</BundleAssemblies>
+    <BundleAssemblies>false</BundleAssemblies>
     <AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
   </PropertyGroup>
   <ItemGroup>
@@ -128,11 +128,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include=".editorconfig" />
-    <AndroidNativeLibrary Include="lib\arm64-v8a\libProAuthKey.so" />
-    <AndroidNativeLibrary Include="lib\armeabi-v7a\libProAuthKey.so" />
-    <AndroidNativeLibrary Include="lib\x86\libProAuthKey.so" />
-    <AndroidNativeLibrary Include="lib\x86_64\libProAuthKey.so" />
-    <AndroidNativeLibrary Include="lib\armeabi\libProAuthKey.so" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Properties\AndroidManifest.xml">
       <SubType>Designer</SubType>
@@ -188,6 +183,9 @@
     <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
       <Version>28.0.0.1</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.Essentials">
+      <Version>1.1.0</Version>
+    </PackageReference>
     <PackageReference Include="ZXing.Net.Mobile">
       <Version>2.4.1</Version>
     </PackageReference>

AuthenticatorPro/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.3.1" package="me.jmh.authenticatorpro" android:installLocation="auto" android:versionCode="12">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.4.0" package="me.jmh.authenticatorpro" android:installLocation="auto" android:versionCode="13">
+	<uses-sdk android:minSdkVersion="21" />
 	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

AuthenticatorPro/Source/Activities/ActivityMain.cs

@@ -128,15 +128,14 @@ protected override void OnPostCreate(Bundle savedInstanceState)
         protected override void OnResume()
         {
             base.OnResume();
-
             _sharedPrefs = PreferenceManager.GetDefaultSharedPreferences(this);
-            //bool firstLaunch = _sharedPrefs.GetBoolean("firstLaunch", true);
+            bool firstLaunch = _sharedPrefs.GetBoolean("firstLaunch", true);
 
-            //if(firstLaunch)
-            //{
-            //    StartActivity(typeof(ActivityIntro));
-            //    return;
-            //}
+            if(firstLaunch)
+            {
+                StartActivity(typeof(ActivityIntro));
+                return;
+            }
 
             if((DateTime.Now - _pauseTime).TotalMinutes >= 1 && PerformLogin()) return;
 

AuthenticatorPro/Source/Utilities/Database.cs

@@ -4,25 +4,29 @@
 using System.Threading.Tasks;
 using AuthenticatorPro.Data;
 using SQLite;
+using Xamarin.Essentials;
 
 namespace AuthenticatorPro.Utilities
 {
     internal static class Database
     {
-        [DllImport("libProAuthKey", EntryPoint = "get_key")]
-        private static extern string GetDatabaseKey();
-
         public static async Task<SQLiteAsyncConnection> Connect()
         {
-            var key = GetDatabaseKey();
+            var databaseKey = await SecureStorage.GetAsync("database_key");
+
+            if(databaseKey == null)
+            {
+                databaseKey = Hash.SHA1(Guid.NewGuid().ToString());
+                await SecureStorage.SetAsync("database_key", databaseKey);
+            }
 
             var dbPath = Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.Personal),
                 "proauth.db3"
             );
 
-            var connection = new SQLiteAsyncConnection(dbPath, true, key);
-            await connection.QueryAsync<int>($@"PRAGMA key='{key}'");
+            var connection = new SQLiteAsyncConnection(dbPath, true, databaseKey);
+            await connection.QueryAsync<int>($@"PRAGMA key='{databaseKey}'");
 
             await connection.CreateTableAsync<Authenticator>();
             await connection.CreateTableAsync<Category>();

AuthenticatorPro/Source/Utilities/StringExt.cs

@@ -10,21 +10,5 @@ public static string Truncate(this string value, int maxLength)
             if(String.IsNullOrEmpty(value)) return value;
             return value.Length <= maxLength ? value : value.Substring(0, maxLength);
         }
-
-        public static string GetSlug(this string value)
-        {
-            value = value.ToLower();
-
-            // Remove apostrophes
-            value = value.Replace("'", "");
-            // Replace any non alphanumerics with a dash
-            value = Regex.Replace(value, "[^a-zA-Z0-9]", "-");
-            // Remove lonely dashes at the start or end of the string
-            value = Regex.Replace(value, "([-]$|^[-])", "");
-            // Remove multiple dashes
-            value = Regex.Replace(value, "([-]{2,})", "-");
-
-            return value;
-        }
     }
 }