Fix crash when attempting to restore invalid backup file.

stratumauth · Aug 14, 2019 · 3cd70ce · 3cd70ce
1 parent 251f95c
commit 3cd70ce
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 5 deletions.
diff --git a/AuthenticatorPro/Assets/about.html b/AuthenticatorPro/Assets/about.html
@@ -10,9 +10,10 @@
 
 <h1>About</h1>
 <p>
-    <b>Authenticator Pro - jmh Development</b>
+    <b>Authenticator Pro - jmh</b>
 </p>
-<p>2 Factor Authenticator for Android</p>
+<p>Open-Source 2 Factor Authenticator for Android</p>
+<p><a href="https://github.com/jamie-mh/AuthenticatorPro">https://github.com/jamie-mh/AuthenticatorPro</a></p>
 
 <h2>Open Source Licences</h2>
 <h3>Albiero.Base32</h3>
@@ -48,6 +49,9 @@ <h3>Xamarin Support Libraries</h3>
 <h3>ZXing.Net.Mobile</h3>
 <p>Apache-2.0 Licence</p>
 
+<h3>Xamarin.Essentials</h3>
+<p>MIT Licence</p>
+
 <h2>Trademark Notice</h2>
 <p>All product names, trademarks and registered trademarks are property of their respective owners. All company, product and service names used in this website are for identification purposes only. Use of these names,trademarks and brands does not imply endorsement.</p>
 

diff --git a/AuthenticatorPro/AuthenticatorPro.Android.csproj b/AuthenticatorPro/AuthenticatorPro.Android.csproj
@@ -184,7 +184,7 @@
       <Version>28.0.0.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.1.0</Version>
+      <Version>1.2.0</Version>
     </PackageReference>
     <PackageReference Include="ZXing.Net.Mobile">
       <Version>2.4.1</Version>

diff --git a/AuthenticatorPro/Properties/AndroidManifest.xml b/AuthenticatorPro/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.5.0" package="me.jmh.authenticatorpro" android:installLocation="auto" android:versionCode="14">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.1" package="me.jmh.authenticatorpro" android:installLocation="auto" android:versionCode="15">
 	<uses-sdk android:minSdkVersion="21" />
 	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

diff --git a/AuthenticatorPro/Resources/values/strings.xml b/AuthenticatorPro/Resources/values/strings.xml
@@ -10,7 +10,7 @@
   <string name="renameAuth">Rename</string>
   <string name="copiedToClipboard">Code copied to clipboard</string>
   <string name="warning">Warning</string>
-  <string name="confirmAuthenticatorDelete">Removing this authenticator will prevent you from generating codes for this account.\nThis does not mean that two factor authentication is disabled on your account.\n\nDeleting this authentication may prevent you from accessing your account.\nPlease make sure that either two factor authentication is disabled or that you have the recovery codes.\n\nAre you sure you want to continue?</string>
+  <string name="confirmAuthenticatorDelete">Removing this authenticator will prevent you from generating codes for this account.\nThis does not mean that two factor authentication is disabled on your account.\n\nDeleting this authenticator may prevent you from accessing your account.\nPlease make sure that either two factor authentication is disabled or that you have the recovery codes.\n\nAre you sure you want to continue?</string>
   <string name="delete">Delete</string>
   <string name="add">Add</string>
   <string name="rename">Rename</string>

diff --git a/AuthenticatorPro/Source/Activities/ActivityRestore.cs b/AuthenticatorPro/Source/Activities/ActivityRestore.cs
@@ -197,6 +197,13 @@ private async Task RestoreBackup(string password = "")
                 }
 
                 var backup = JsonConvert.DeserializeObject<Backup>(contents);
+
+                if(backup.Authenticators == null)
+                {
+                    Toast.MakeText(this, Resource.String.invalidFileError, ToastLength.Short).Show();
+                    return;
+                }
+
                 var authsInserted = 0;
                 var categoriesInserted = 0;
 

diff --git a/fastlane/metadata/android/en-US/changelogs/200015.txt b/fastlane/metadata/android/en-US/changelogs/200015.txt
@@ -0,0 +1 @@
+Fix crash when attempting to restore invalid backup file.
diff --git a/fastlane/metadata/android/en-US/changelogs/300015.txt b/fastlane/metadata/android/en-US/changelogs/300015.txt
@@ -0,0 +1 @@
+Fix crash when attempting to restore invalid backup file.
diff --git a/fastlane/metadata/android/en-US/changelogs/400015.txt b/fastlane/metadata/android/en-US/changelogs/400015.txt
@@ -0,0 +1 @@
+Fix crash when attempting to restore invalid backup file.
diff --git a/fastlane/metadata/android/en-US/changelogs/500015.txt b/fastlane/metadata/android/en-US/changelogs/500015.txt
@@ -0,0 +1 @@
+Fix crash when attempting to restore invalid backup file.