From ba1e591dc7ebdabba49c6992b405e707f29a7400 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Thu, 19 Feb 2015 20:30:26 +0100
Subject: [PATCH] Make sure "duplicate UUID" error is not repeated after fixing
 the db Make sure no duplicate UUIDs are created by cancelling the save
 operation and saving again Reverse sort order for modification date (now
 descending) Added beta warning for kdb change log + manifest for 0.9.7-pre1

---
 .gitignore                                    |   2 +
 src/Kp2aBusinessLogic/UiStringKey.cs          |   3 +-
 src/Kp2aBusinessLogic/database/Database.cs    |  36 +++++++++++-------
 .../database/KdbDatabaseFormat.cs             |   8 +++-
 .../database/edit/AddEntry.cs                 |  10 ++++-
 src/Kp2aBusinessLogic/database/edit/LoadDB.cs |   2 +-
 src/Kp2aUnitTests/TestBase.cs                 |   2 +-
 src/keepass2android/ChangeLog.cs              |   2 +-
 src/keepass2android/KeeChallenge.cs           |   3 +-
 src/keepass2android/PasswordActivity.cs       |  17 +++++++--
 .../Properties/AndroidManifest_net.xml        |   4 +-
 src/keepass2android/PwGroupListAdapter.cs     |   4 +-
 .../drawable-xxxhdpi/ic_launcher_1.png        | Bin 0 -> 3466 bytes
 .../drawable-xxxhdpi/ic_launcher_2.png        | Bin 0 -> 3672 bytes
 .../drawable-xxxhdpi/ic_launcher_3.png        | Bin 0 -> 4802 bytes
 .../drawable-xxxhdpi/ic_launcher_4.png        | Bin 0 -> 4686 bytes
 .../Resources/values/strings.xml              |  14 ++++++-
 src/keepass2android/app/App.cs                |  11 +++++-
 src/keepass2android/keepass2android.csproj    |   1 +
 src/keepass2android/packages.config           |   7 ++++
 20 files changed, 96 insertions(+), 30 deletions(-)
 create mode 100644 src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_1.png
 create mode 100644 src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_2.png
 create mode 100644 src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_3.png
 create mode 100644 src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_4.png
 create mode 100644 src/keepass2android/packages.config

diff --git a/.gitignore b/.gitignore
index 89556da0..69198204 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,3 +119,5 @@ Thumbs.db
 /src/MasterKeeWinPlugin/bin/Release
 /src/SamplePlugin
 /src/packages/
+
+*.apk
diff --git a/src/Kp2aBusinessLogic/UiStringKey.cs b/src/Kp2aBusinessLogic/UiStringKey.cs
index d7d9459c..3bc22d20 100644
--- a/src/Kp2aBusinessLogic/UiStringKey.cs
+++ b/src/Kp2aBusinessLogic/UiStringKey.cs
@@ -56,6 +56,7 @@ namespace keepass2android
 		FileIsReadOnlyOnKitkat,
 		CopyFileRequiredForEditing,
 		DuplicateUuidsError,
-		DuplicateUuidsErrorAdditional
+		DuplicateUuidsErrorAdditional,
+		KdbBetaWarning
     }
 }
diff --git a/src/Kp2aBusinessLogic/database/Database.cs b/src/Kp2aBusinessLogic/database/Database.cs
index f4bab2ef..59b552e6 100644
--- a/src/Kp2aBusinessLogic/database/Database.cs
+++ b/src/Kp2aBusinessLogic/database/Database.cs
@@ -110,21 +110,31 @@ namespace keepass2android
 			Stream s = databaseData ?? fileStorage.OpenFileForRead(iocInfo);
 			var fileVersion = _app.GetFileStorage(iocInfo).GetCurrentFileVersionFast(iocInfo);
 			PopulateDatabaseFromStream(pwDatabase, s, iocInfo, compositeKey, status, databaseFormat);
-			LastFileVersion = fileVersion;
+			try
+			{
+				LastFileVersion = fileVersion;
+
+				status.UpdateSubMessage("");
+
+				Root = pwDatabase.RootGroup;
+				PopulateGlobals(Root);
+
+				Loaded = true;
+				KpDatabase = pwDatabase;
+				SearchHelper = new SearchDbHelper(app);
+
+				_databaseFormat = databaseFormat;
+
+				CanWrite = databaseFormat.CanWrite && !fileStorage.IsReadOnly(iocInfo);
+			}
+			catch (Exception)
+			{
+				Clear();				
+				throw;
+			}
 			
-			status.UpdateSubMessage("");
 
-			Root = pwDatabase.RootGroup;
-			PopulateGlobals(Root);
-
-
-			Loaded = true;
-			KpDatabase = pwDatabase;
-			SearchHelper = new SearchDbHelper(app);
-
-			_databaseFormat = databaseFormat;
-
-			CanWrite = databaseFormat.CanWrite && !fileStorage.IsReadOnly(iocInfo);
+			
 		}
 
 		/// <summary>
diff --git a/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs b/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs
index 61a2143e..19e4ae32 100644
--- a/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs
+++ b/src/Kp2aBusinessLogic/database/KdbDatabaseFormat.cs
@@ -24,10 +24,16 @@ namespace keepass2android
 {
 	public class KdbDatabaseFormat: IDatabaseFormat
 	{
+		private readonly IKp2aApp _app;
 		private Dictionary<PwUuid, AdditionalGroupData> _groupData = new Dictionary<PwUuid, AdditionalGroupData>();
 		private static readonly DateTime _expireNever = new DateTime(2999,12,28,23,59,59);
 		private List<PwEntryV3> _metaStreams;
 
+		public KdbDatabaseFormat(IKp2aApp app)
+		{
+			_app = app;
+		}
+
 		public void PopulateDatabaseFromStream(PwDatabase db, Stream s, IStatusLogger slLogger)
 		{
 			#if !EXCLUDE_KEYTRANSFORM
@@ -215,7 +221,7 @@ namespace keepass2android
 		public bool CanWrite { get { return true; } }
 		public string SuccessMessage { get
 		{
-			return "";
+			return _app.GetResourceString(UiStringKey.KdbBetaWarning);
 		} }
 
 		public void Save(PwDatabase kpDatabase, Stream stream)
diff --git a/src/Kp2aBusinessLogic/database/edit/AddEntry.cs b/src/Kp2aBusinessLogic/database/edit/AddEntry.cs
index 4db60b9a..6c4c313b 100644
--- a/src/Kp2aBusinessLogic/database/edit/AddEntry.cs
+++ b/src/Kp2aBusinessLogic/database/edit/AddEntry.cs
@@ -48,7 +48,15 @@ namespace keepass2android
 		
 		public override void Run() {	
 			StatusLogger.UpdateMessage(UiStringKey.AddingEntry);
-			_parentGroup.AddEntry(_entry, true);
+
+			//make sure we're not adding the entry if it was added before.
+			//(this might occur in very rare cases where the user dismissis the save dialog 
+			//by rotating the screen while saving and then presses save again)
+			if (_parentGroup.FindEntry(_entry.Uuid, false) == null)
+			{
+				_parentGroup.AddEntry(_entry, true);	
+			}
+			
 			
 			// Commit to disk
 			SaveDb save = new SaveDb(_ctx, _app, OnFinishToRun);
diff --git a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs
index 8f2dc0be..82923a94 100644
--- a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs
+++ b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs
@@ -125,7 +125,7 @@ namespace keepass2android
 			}
 			catch (OldFormatException)
 			{
-				_format = new KdbDatabaseFormat();
+				_format = new KdbDatabaseFormat(_app);
 				TryLoad(databaseStream);
 			}
 			catch (InvalidCompositeKeyException)
diff --git a/src/Kp2aUnitTests/TestBase.cs b/src/Kp2aUnitTests/TestBase.cs
index 2b8c6d9a..b0c2c60b 100644
--- a/src/Kp2aUnitTests/TestBase.cs
+++ b/src/Kp2aUnitTests/TestBase.cs
@@ -138,7 +138,7 @@ namespace Kp2aUnitTests
 			Database db = app.CreateNewDatabase();
 			if (filename.EndsWith(".kdb"))
 			{
-				db.DatabaseFormat = new KdbDatabaseFormat();
+				db.DatabaseFormat = new KdbDatabaseFormat(app);
 			}
 
 			db.KpDatabase = new PwDatabase();
diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs
index 98d224b5..61e86325 100644
--- a/src/keepass2android/ChangeLog.cs
+++ b/src/keepass2android/ChangeLog.cs
@@ -26,7 +26,7 @@ namespace keepass2android
 			AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog));
 			builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
 			List<string> changeLog = new List<string>{
-					
+					ctx.GetString(Resource.String.ChangeLog_0_9_7),
 					ctx.GetString(Resource.String.ChangeLog_0_9_6),
 					ctx.GetString(Resource.String.ChangeLog_0_9_5),
 					ctx.GetString(Resource.String.ChangeLog_0_9_4),
diff --git a/src/keepass2android/KeeChallenge.cs b/src/keepass2android/KeeChallenge.cs
index 381c068b..78b1d278 100644
--- a/src/keepass2android/KeeChallenge.cs
+++ b/src/keepass2android/KeeChallenge.cs
@@ -19,6 +19,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Security.Cryptography;
 using System.Diagnostics;
@@ -56,7 +57,7 @@ namespace KeeChallenge
             set;
         }
 
-		private KeeChallengeProv()
+	    public KeeChallengeProv()
         {
             LT64 = false;
         }         
diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 0bc6e655..49319330 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -1464,9 +1464,6 @@ namespace keepass2android
 				{
 					
 					_act.ClearEnteredPassword();
-
-					_act.LaunchNextActivity();
-
 					_act.BroadcastOpenDatabase();
 
 
@@ -1476,12 +1473,24 @@ namespace keepass2android
 				{
 					new AlertDialog.Builder(_act).SetMessage(Message)
 					                             .SetPositiveButton(Android.Resource.String.Ok,
-					                                                (sender, args) => ((Dialog) sender).Dismiss())
+					                                                (sender, args) =>
+						                                                {
+							                                                ((Dialog) sender).Dismiss();
+																			_act.LaunchNextActivity();
+						                                                })
+												.SetCancelable(false)
 												.Show();
+					
 				}
 				else
 				{
 					DisplayMessage(_act);	
+					if (Success)
+					{
+						_act.LaunchNextActivity();
+					}
+						
+
 				}
 				
 
diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index 9b2669cc..ac72c5d3 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="52" 
-			android:versionName="0.9.6" 
+			android:versionCode="53" 
+			android:versionName="0.9.7-pre1" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
diff --git a/src/keepass2android/PwGroupListAdapter.cs b/src/keepass2android/PwGroupListAdapter.cs
index 2a079778..2940acc6 100644
--- a/src/keepass2android/PwGroupListAdapter.cs
+++ b/src/keepass2android/PwGroupListAdapter.cs
@@ -49,12 +49,12 @@ namespace keepass2android
 
 		public int CompareEntries(PwEntry a, PwEntry b)
 		{
-			return a.LastModificationTime.CompareTo(b.LastModificationTime);
+			return -a.LastModificationTime.CompareTo(b.LastModificationTime);
 		}
 
 		public int CompareGroups(PwGroup a, PwGroup b)
 		{
-			return a.LastModificationTime.CompareTo(b.LastModificationTime);
+			return -a.LastModificationTime.CompareTo(b.LastModificationTime);
 		}
 	}
 	class CreationDateSortOrder : IGroupViewSortOrder
diff --git a/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_1.png b/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3561274f8e1c92b2f6c47dc707529951643d21f
GIT binary patch
literal 3466
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
BPuc(g

literal 0
HcmV?d00001

diff --git a/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_2.png b/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8294b06145a65e901ffb38829eae6d07919f019
GIT binary patch
literal 3672
zcmai%c{J4D|Ho&>sF{hFv5k_?*az8{jCG8`$TnoJga~0!*~42*_J}N{Yzd#rkg{ZH
zlr2%Dtd*^?C&rpg<EwLi=lst3{_{QOd0($T?z#8A{&?McpO0j+l_@vk7y<+Wahs8d
zwg<WG?|>aTh_+w-4<97qYsOC3&IDe%7Uq7%3uNdS=;4Ji3vl=Lvh{NJj0o=W(mh!G
z+l**v7e4;u!C8O15rLZxOztktQw7ZdLFAfV<GKfB<pbqY`TBMWzJ&ne-xtvcSyBM<
zbb*`Qzn8Ng%TY-=wtZ(1x>Ch*N||_Hi)VIY>QgWwf%pe7l0W5@n?FQvzrNp7w-5Kc
zKVa@0+gke=&uAg8aI3m?c-(JQ0V<ZjOMv~4(9zHEoH3r*WelKJ+?zwIKG9s*W6ALO
z7t41-SE7A)bLHcNfJ?0R<L#6fTF0R%b)@=XThP7f{?DRTgWvgtOcJ*4@lv9gy&JmM
zzh?-??mVC{7pJ^EHmCC&^{$xfqimI>F7(~kHrLM;QbO6QJx1*}hrY>Of~Y|x6ZIN?
zP6`H$j58#}7W3`3&ZwXC$;@y~G{T9Z4Nwz5iQo5Y=8YnwJR<CTp88t|8s>aSX7ck)
z>}_|*tg+N%JOoC${JZ<=S#m%~vWh{wsE5$#QGaYsz^*fh*&zg160;)JmbhFv;#Rte
z^F>Q^_+lASXIfaZ*bvl=_wg(Cpq^|25iqID6hvSh<-}t_g#Q;%`RuX3*TQNr#h=#l
z){()q#&lF43r!w6a;#%k=iAIshAW@ZMWd4D?s>W6owt5FGDhh7t!G*DbKR^d9K>Rq
zZQWOiGN}G0c13hHVTm1d!QgzI2K&14>yeJndsNnxED(I_&+00(y2yF+h0nbS?7C=z
zchFZ_1iO?azPq)yP_xh&X?2H7@C=l{O)IuJ-07x)w!!YU!?PgI7%Xwk<NYNZWI;qb
zinz(W-BT?KL0~>iY)3PzFLJ6dpU>AP-wmrc>;hG0DQFbT^y|<<lZMT!vR}z8i5G*U
z+h9Rc-{YC{Lq{HWhUEpqp2B$7F)v397p_iizP>Yg+zUwt!CS(1^A}j9YHZf-?{p95
zk9YW#DdYDWGP$}tMd9WtZAq0WfY*Q|yNpVR8riqGY1mkQc^AJC6;%eKSkvW28G1qd
zSqnWra^#p+-3WNG0(tOT<K|)Je7BBuQtC+4AX|h8AVypNmEgzQy^LAC8NPQtb(H;C
zbGN1T1>qLd^h<_pGRWjsbikbNM3~nY!gtNuVq)F|CmD}X+zd%M-d@yO_e^f4ZFzAk
zX5iGQ(qyw-r;)MvPVYGtCv_s2n8Vll4@qgfX6-JMTuFIofr<JZ^$#C7?fB%8i(ywa
zorNrCRueEEcFqsbtSr$&wg?YXLeEv*&9T5^zso$v-`e3&T>Lz?ARDj1y`s)9SJ|jj
z<pGvoh#SpOWhzzgE{GMn?%q*nS=0+owN7aS$Mx6Up8ip%$u#UYlReb8y|jP$R;WmJ
zX<d9FPr`X9KLF<7In?<omM#?<eYN7ctHU|D7}k#rqOtEI);JITdeT;~A!q~D0c&qS
z{U+K&pF-{qM1H?8^EoHBqi95dwvo=PFt6chI1xI#Lx7TQ$pT5>)s*naZ&|C*^*@1r
zk<QYqm7X?GuDFw(WBq<&#xq=(dE=%fA|`7}&2AE~R8^5ukcA;6nbxDc)n^1d>kugD
zS9DJP;KqCC$R2$H!vgSXo_14#PI<E4lBKe~?&`}i`O9;T*1un+3?dxg<a#O>ePp$N
zt5s!4;)acZh#RK33@lI_&p_&_Q6m4){LatJY$+}V>>b{-X#HsuA6xBARydv7TQ=?R
zftJ~7MgeLnX|-1MCJX0FLW#xwe9-gI+kzlneO<b9)D1*_KqpaHF(;Qppexoo&!=^B
zh+cx=bl0jf>G?QC9eD)%@oMtTM~I47G4ZRcFzf|PTpqO9qhoe$iz?NvlcAIHq^dae
z$G}*-Ei7qyME_-1D5Yj2ihk!rX^+C-V@Aeow|7^(+zk=}G;7(+d^K^F!|27h$CUKi
z*G9}uZutVwx^AnVK#!iABXl8)yB4<Y!y4wAq?Lr<J=d!`Pvxtpf{-1E@-fAnL(b3$
zb@pcQ6$nRfd3S?&0<*TFZUAPWrW>hrMZ(Y%3d9IM>B<<L@Lkb8PS6T!GCsCG?A_pU
zI`<*^sBx(Pp=hcW@&<e|0iMN_nTIX72DD!5njzJgIVAf>eTE~UUVe86j^I}ppUoNa
zykn>?EIf?Mi85pZ!+|o{!G<Wq1x~<BaY);MYc73fa`SxYGJo17-nz?2A2!73q*Tce
zGxr82r3IHnFcH=w0^c3s5${rZiQi^ikn(BCuj1HgdBo`lDr#wDuV3t%g?srSnjED+
zTgN2)_T?r{WCt_`1zHi6ql<}L{M<Mfb4&0jSG1i>lU@3SP^aOHFefYauH|5__IaQb
zB2DM5kU6e0uC)DVY!|$fxJR_kylmUDLCTW|UKVdWt2$+lOwfeZqIRA{#-NF{%x<bp
zgH1}i`PA)hzwL~upfuRp&&9UrV=FwKlHnB?uJz?%)e?S?VAc~wa-vElnm!SK@emPM
zdn-TKISWg+g{#|Zm1!?hC+EBL#Kg8A!U(dUp#hm8hqy~6iTCnoTZ}>sK4-L5Kb;gp
z7PeJjHfhxE+CWSAKv}K=tAX|Q#Wr3<S$}LA=UgC_Le^kb2M2g=6u<~FK)N}-dI6l_
zbowXj>mhfcr-$(ciCM7Rs^FE7Kaw}daQx&cnLmdo178kL#%$fc;xx<ocpBkw*V(YH
z+e`z>bq_|60-@>e%JLpuk%DG_fNg#I-h$U`e#9J(G`c@D`6P>10(xyweA*G2U;&z3
z>)2b)*XSxa8Yop!(;lv~Eo@|Df*Y}_%&oG)*g&1mWpfiWkmXq{ZQrW^^P%C<o4{kP
zmQqD*LoT7*XmyilCg?|XZwwEBwNna9t10Fqg!6jz@$9HUW1y#YkMkivaAGh(PgJNa
zwqGko0qv%_N8KE9qYTohfs0Tw?%74EBPV!F(?%C-f>>39*1kK<xyr*s36n{vc{twB
z2o=q=DCb#%rGw@==gR(ws;46_Mhc+98|uB8sW5^BAV;P37b{YFoO~WlVOmCC$QOtw
zeZDspbJO6~2`FmS;&w83gpnHLscj!PNoD7{)|Zt!n0TFDB>Iam%&3?N-8sg0?vx0z
ziT-fN;Rpg_#3~KQ%l~xYw0vkj2aEmZltf5>2_o(lcBMif+h-oc4^F<0;zFj)W-vcV
zedGtVZC~dH!|hT2yOP_gVkwCp;;ZI`(3~EkHfeSa@7xtg-#YG+-~akvLMm9!Y~#M$
z8xepP@!!f^Lscd#4@I9e+ipw7@dKu;ttG>4R<=(f-akzGc0U*kLG4PS#fy1Ko}6tT
z0rEi|!KC8Hc&%UKX``*a&aoMChwa?_wmS4Q?RkdRexn^uwf+2JI1Xr$A!NNjDt`a4
zr8cTYo>lDU4i)^P6U5W~WafTc?k9!vRI`J()!Xx`i;UZa5)2$rdo8@qR%SWgbJf%h
zK<(d(r@gmwpC)2Br_S<rp(FIeV{$m2f{(V-RMytfCmQLpoKxm~R<{#&8XyF5qmr#_
zYZ;c{Ul|hxdN<+KOJZNNht|E{ab5H$fPWo*IM6{Eba8l7D1!jX`Z!>myy&kK9!*3#
zj5E_d?Zby!zURx{`>N{eg?P(^*54of*739WbWnV>E!5!(_&HpIaV+pxIM04@jxUE4
zun{f9xHur#DWVlkR;RBu4Z>6Nk(vc$wc{s9L_%?~2Hl+>7_n;bJ=rqP=G%+N73SpC
zN47PFiH>>Y^SMb2i%(l9aq_w#+n(p;-Vv7mxXI$jR~nO@UEH<g(<E_cDr&NM;TV#5
zWnrKzobXAc=j1uw@2ZysM4mf%lj)5PFI+EM?#AYW&Nlm}uNp`wCNX*GN=b$gKS>Z;
znSl9(eB((2nNV{t(-Y0k@$$Jh(Za@5e|8W@PjW3O`@WRs$8RUb#;+Ok1lm=qAQ3Wc
zSkUARRJjee!2@qc%LEn212cHRL$J_kk%MseGu9D!i-jQC@?I36FST~AmycoFl#?K9
zi?9KAkAb>jD7lB24}m2!CGJ0SX%Z<?vHGSOhmzQ%VnIbzgDzLxH%8tAoA#$)Pd|Ol
zsiNpMcYBtRpUz!Xqu2(ssNdBPp1XnOfzRAPKYs~s4zjW6Fv9#iWGP<6L551Mn<*RP
z#T7s)0MYet>k$rGFV^SR2?Ld)tCcH3#ivW+P{5?MshD`s@;w}%MLq{F0sP-WxgLCQ
zjR>KRa1z-%NsKG*9QA#m<T?&?uyqmi3{-LuQVb(8IPu8Lw?_bR%x$5+GfMw=sA1#V
z_dVP+&|KG?EwlsqjO7%>NmiCBk^l!E)MN_$a-E*-Ohq3>n)WFwTKb-i5p0wFlloZL
z-os(qA_W*d61(nE+R~!?=&v!4;ww6^`EMh!L?l#gw@UGX^m^(#cR+6*B>XRJjJJ#a
z!I=PE?@Vq%JF@1h&;JgwX$l%tv5AuQ@3p_u(v%#gk4uoSkbbc7DZ1k9b?skw(a~Dc
zl#H)g8DqdQoHf5<vtsy0C+vgnv!DsW?Xz04yLuJEu@8i*S7vYIZ;gkj+CbmJgODC^
zSNZB0aGWbWDnQa_STuCws-z}<^wW>oBL_sJsE$1OQMBG~q=`|Jl*uo;&yR9d@`(AL
jICVf=q?%uJ5C@1d&i-&okt^f?6+vdkRzw=X?Z$rq#08!b

literal 0
HcmV?d00001

diff --git a/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_3.png b/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..44af377b82d47c28088c3de469684306424717b9
GIT binary patch
literal 4802
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
GkpBUcrRbFa

literal 0
HcmV?d00001

diff --git a/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_4.png b/src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..db53eb5e497b5a0217d30b803e9e95f35e2d8a98
GIT binary patch
literal 4686
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

literal 0
HcmV?d00001

diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 9c1c8437..d9a73540 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -521,12 +521,24 @@
 	<string name="CancelReadOnly">Cancel, open read-only.</string>
 	
 	<string name="CopyingFile">Copying file...</string>
+
+	<string name="KdbBetaWarning">Please note: You have loaded a Keepass 1 database. Keepass2Android has recently added write support for this database format. Despite thorough testing, the author does not guarantee that all data will be saved correctly. Please always keep a backup of the original database (Dropbox automatically stores recent versions) before making changes. Please report any issues. Thanks!</string>
 	
 	<string name="ChangeLog_title">Change log</string>
 
 	<string name="PreviewWarning">Please note! This is a preview release and might come with some flaws! If you experience *anything* unexpected, please let me know (on Codeplex or by email).</string>
 
-	<string name="ChangeLog_0_9_6">
+	<string name="ChangeLog_0_9_7">
+		Version 0.9.7\n
+		* write support for Keepass 1 (kdb) databases (beta!)\n
+		* better switching back to previous keyboard (also works on non-rooted devices)\n
+		* support for KeeChallenge with variable length challenges\n
+		* prevent taking screenshots from QuickUnlock and password screens\n
+		* reverse sort order for Sort by Modification Date (now descending)\n
+		* bug fixes: Notes view now updated correctly after changes, Password views now hiding password correctly on (hopefully)  all devices, fixed issue that allowed to add an entry twice, fixed issue with showing Duplicate UUID warning even after fixing the database\n
+	</string>
+
+		<string name="ChangeLog_0_9_6">
 		Version 0.9.6\n
 		* allow to import key file and/or local database file to app internal directory (see settings)\n
 		* allow different sorting options\n
diff --git a/src/keepass2android/app/App.cs b/src/keepass2android/app/App.cs
index 0a5c2af4..40700fe5 100644
--- a/src/keepass2android/app/App.cs
+++ b/src/keepass2android/app/App.cs
@@ -367,6 +367,7 @@ namespace keepass2android
 			public RealProgressDialog(Context ctx)
 			{
 				_pd = new ProgressDialog(ctx);
+				_pd.SetCancelable(false);
 			}
 
 			public void SetTitle(string title)
@@ -381,7 +382,15 @@ namespace keepass2android
 
 			public void Dismiss()
 			{
-				_pd.Dismiss();
+				try
+				{
+					_pd.Dismiss();
+				}
+				catch (Exception e)
+				{
+					Kp2aLog.Log(e.ToString());
+				}
+				
 			}
 
 			public void Show()
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 59ec5fd3..9b56afb0 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -689,6 +689,7 @@
     <ProjectReference Include="..\Kp2aBusinessLogic\Kp2aBusinessLogic.csproj">
       <Project>{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}</Project>
       <Name>Kp2aBusinessLogic</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj">
       <Project>{70D3844A-D9FA-4A64-B205-A84C6A822196}</Project>
diff --git a/src/keepass2android/packages.config b/src/keepass2android/packages.config
new file mode 100644
index 00000000..2c3ad1a4
--- /dev/null
+++ b/src/keepass2android/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Xamarin.Android.Support.v4" version="21.0.3.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Android.Support.v7.AppCompat" version="21.0.3.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Android.Support.v7.MediaRouter" version="21.0.3.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.GooglePlayServices" version="22.0.0.0" targetFramework="MonoAndroid50" />
+</packages>
\ No newline at end of file