diff --git a/src/KeePassLib2Android/Serialization/ProtoBuf/KdbpFile.cs b/src/KeePassLib2Android/Serialization/ProtoBuf/KdbpFile.cs index db6ad87d..b8d165f0 100644 --- a/src/KeePassLib2Android/Serialization/ProtoBuf/KdbpFile.cs +++ b/src/KeePassLib2Android/Serialization/ProtoBuf/KdbpFile.cs @@ -592,7 +592,7 @@ namespace KeePassLib.Serialization [ProtoMember(5, OverwriteList = true)] public byte[] CustomIconUuid { - get { return mGroup.CustomIconUuid.EqualsValue(PwUuid.Zero) ? null : mGroup.CustomIconUuid.UuidBytes; ; } + get { return mGroup.CustomIconUuid.Equals(PwUuid.Zero) ? null : mGroup.CustomIconUuid.UuidBytes; ; } set { mGroup.CustomIconUuid = value == null ? PwUuid.Zero : new PwUuid(value); } } @@ -866,7 +866,7 @@ namespace KeePassLib.Serialization [ProtoMember(3, OverwriteList = true)] public byte[] CustomIconUuid { - get { return mEntry.CustomIconUuid.EqualsValue(PwUuid.Zero) ? null : mEntry.CustomIconUuid.UuidBytes; } + get { return mEntry.CustomIconUuid.Equals(PwUuid.Zero) ? null : mEntry.CustomIconUuid.UuidBytes; } set { mEntry.CustomIconUuid = value == null ? PwUuid.Zero : new PwUuid(value); } } diff --git a/src/Kp2aBusinessLogic/PwGroupEqualityFromIdComparer.cs b/src/Kp2aBusinessLogic/PwGroupEqualityFromIdComparer.cs index 066e00cf..31d8951f 100644 --- a/src/Kp2aBusinessLogic/PwGroupEqualityFromIdComparer.cs +++ b/src/Kp2aBusinessLogic/PwGroupEqualityFromIdComparer.cs @@ -28,7 +28,7 @@ namespace keepass2android #region IEqualityComparer implementation public bool Equals (PwGroup x, PwGroup y) { - return x.Uuid.EqualsValue(y.Uuid); + return x.Uuid.Equals(y.Uuid); } public int GetHashCode (PwGroup obj) { diff --git a/src/Kp2aBusinessLogic/PwUuidEqualityComparer.cs b/src/Kp2aBusinessLogic/PwUuidEqualityComparer.cs index c0aa5419..ed03a57a 100644 --- a/src/Kp2aBusinessLogic/PwUuidEqualityComparer.cs +++ b/src/Kp2aBusinessLogic/PwUuidEqualityComparer.cs @@ -28,7 +28,7 @@ namespace keepass2android #region IEqualityComparer implementation public bool Equals (PwUuid x, PwUuid y) { - return x.EqualsValue(y); + return x.Equals(y); } public int GetHashCode (PwUuid obj) { diff --git a/src/Kp2aBusinessLogic/database/Database.cs b/src/Kp2aBusinessLogic/database/Database.cs index 92a15239..88bfbccf 100644 --- a/src/Kp2aBusinessLogic/database/Database.cs +++ b/src/Kp2aBusinessLogic/database/Database.cs @@ -113,7 +113,7 @@ namespace keepass2android pwDatabase.Open(databaseData ?? fileStorage.OpenFileForRead(iocInfo), filename, iocInfo, compositeKey, status); LastFileVersion = fileVersion; } - catch (InvalidCompositeKeyException e) + catch (InvalidCompositeKeyException) { if ((password == "") && (keyfile != null)) { diff --git a/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs b/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs index cab35523..5bde910d 100644 --- a/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs +++ b/src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs @@ -92,7 +92,7 @@ namespace keepass2android bGroupListUpdateRequired = true; } - else { System.Diagnostics.Debug.Assert(pgRecycleBin.Uuid.EqualsValue(Db.KpDatabase.RecycleBinUuid)); } + else { System.Diagnostics.Debug.Assert(pgRecycleBin.Uuid.Equals(Db.KpDatabase.RecycleBinUuid)); } } protected abstract UiStringKey QuestionsResourceId diff --git a/src/Kp2aBusinessLogic/database/edit/UpdateEntry.cs b/src/Kp2aBusinessLogic/database/edit/UpdateEntry.cs index b4850566..31c7548d 100644 --- a/src/Kp2aBusinessLogic/database/edit/UpdateEntry.cs +++ b/src/Kp2aBusinessLogic/database/edit/UpdateEntry.cs @@ -55,8 +55,8 @@ namespace keepass2android if ( Success ) { // Mark group dirty if title, icon or Expiry stuff changes if ( ! _backup.Strings.ReadSafe (PwDefs.TitleField).Equals(_updatedEntry.Strings.ReadSafe (PwDefs.TitleField)) - || ! _backup.IconId.Equals(_updatedEntry.IconId) - || ! _backup.CustomIconUuid.EqualsValue(_updatedEntry.CustomIconUuid) + || ! _backup.IconId.Equals(_updatedEntry.IconId) + || !_backup.CustomIconUuid.Equals(_updatedEntry.CustomIconUuid) || _backup.Expires != _updatedEntry.Expires || (_backup.Expires && (! _backup.ExpiryTime.Equals(_updatedEntry.ExpiryTime))) ) diff --git a/src/Kp2aUnitTests/TestFileStorage.cs b/src/Kp2aUnitTests/TestFileStorage.cs index 90e30072..a5d0e524 100644 --- a/src/Kp2aUnitTests/TestFileStorage.cs +++ b/src/Kp2aUnitTests/TestFileStorage.cs @@ -21,8 +21,6 @@ namespace Kp2aUnitTests _builtIn.Delete(ioc); } - public IFileStorageSetup RequiredSetup { get { return null; } } - public void Delete(IOConnectionInfo ioc) { throw new NotImplementedException(); diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs index 29e27981..7c13ce2a 100644 --- a/src/keepass2android/EntryEditActivity.cs +++ b/src/keepass2android/EntryEditActivity.cs @@ -120,7 +120,7 @@ namespace keepass2android entryId = new PwUuid(MemUtil.HexStringToByteArray(uuidBytes)); State.ParentGroup = null; - if (entryId.EqualsValue(PwUuid.Zero)) + if (entryId.Equals(PwUuid.Zero)) { String groupId = i.GetStringExtra(KeyParent); State.ParentGroup = db.KpDatabase.RootGroup.FindGroup(new PwUuid(MemUtil.HexStringToByteArray(groupId)), true); diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs index 4bd78ca0..e7c4dfec 100644 --- a/src/keepass2android/GroupBaseActivity.cs +++ b/src/keepass2android/GroupBaseActivity.cs @@ -466,7 +466,7 @@ namespace keepass2android MoveElementTask moveElementTask = AppTask as MoveElementTask; if (moveElementTask != null) { - if (moveElementTask.Uuid.EqualsValue(uuid)) + if (moveElementTask.Uuid.Equals(uuid)) return true; } return false; diff --git a/src/keepass2android/Utils/Util.cs b/src/keepass2android/Utils/Util.cs index 35ca47cf..0751091b 100644 --- a/src/keepass2android/Utils/Util.cs +++ b/src/keepass2android/Utils/Util.cs @@ -148,9 +148,10 @@ namespace keepass2android private static void ShowInternalLocalFileChooser(Activity act, int requestCodeBrowse, bool forSaving, string defaultPath) { + +#if !EXCLUDE_FILECHOOSER const string fileProviderAuthority = "keepass2android.keepass2android.android-filechooser.localfile"; -#if !EXCLUDE_FILECHOOSER Intent i = Keepass2android.Kp2afilechooser.Kp2aFileChooserBridge.GetLaunchFileChooserIntent(act, fileProviderAuthority, defaultPath); diff --git a/src/keepass2android/icons/DrawableFactory.cs b/src/keepass2android/icons/DrawableFactory.cs index d01c711b..514bceac 100644 --- a/src/keepass2android/icons/DrawableFactory.cs +++ b/src/keepass2android/icons/DrawableFactory.cs @@ -53,7 +53,7 @@ namespace keepass2android public Drawable GetIconDrawable (Resources res, PwDatabase db, PwIcon icon, PwUuid customIconId) { - if (!customIconId.EqualsValue(PwUuid.Zero)) { + if (!customIconId.Equals(PwUuid.Zero)) { return GetIconDrawable (res, db, customIconId); } return GetIconDrawable (res, icon); @@ -85,7 +85,7 @@ namespace keepass2android public Drawable GetIconDrawable (Resources res, PwDatabase db, PwUuid icon) { InitBlank (res); - if (icon.EqualsValue(PwUuid.Zero)) { + if (icon.Equals(PwUuid.Zero)) { return _blank; } Drawable draw; diff --git a/src/keepass2android/search/SearchResults.cs b/src/keepass2android/search/SearchResults.cs index c2001a97..efe2eb9e 100644 --- a/src/keepass2android/search/SearchResults.cs +++ b/src/keepass2android/search/SearchResults.cs @@ -34,8 +34,6 @@ namespace keepass2android.search [IntentFilter(new[]{Intent.ActionSearch}, Categories=new[]{Intent.CategoryDefault})] public class SearchResults : GroupBaseActivity { - private GroupView _groupView; - protected override void OnCreate (Bundle bundle) { base.OnCreate (bundle);