moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-11-25 02:32:26 -05:00
Code Issues Releases Wiki Activity

Adaptions to 2.24 KPLib changes

Browse Source
This commit is contained in:
Philipp Crocoll 2013-11-13 04:13:45 +01:00
parent 1b84707970
commit 38572cf2a6
12 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/KeePassLib2Android/Serialization/ProtoBuf/KdbpFile.cs
View File

@ -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); }
}

2
src/Kp2aBusinessLogic/PwGroupEqualityFromIdComparer.cs
View File

@ -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)
{

2
src/Kp2aBusinessLogic/PwUuidEqualityComparer.cs
View File

@ -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)
{

2
src/Kp2aBusinessLogic/database/Database.cs
View File

@ -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))
{

2
src/Kp2aBusinessLogic/database/edit/DeleteRunnable.cs
View File

@ -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

4
src/Kp2aBusinessLogic/database/edit/UpdateEntry.cs
View File

@ -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)))
)

2
src/Kp2aUnitTests/TestFileStorage.cs
View File

@ -21,8 +21,6 @@ namespace Kp2aUnitTests
_builtIn.Delete(ioc);
}
public IFileStorageSetup RequiredSetup { get { return null; } }
public void Delete(IOConnectionInfo ioc)
{
throw new NotImplementedException();

2
src/keepass2android/EntryEditActivity.cs
View File

@ -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);

2
src/keepass2android/GroupBaseActivity.cs
View File

@ -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;

3
src/keepass2android/Utils/Util.cs
View File

@ -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);

4
src/keepass2android/icons/DrawableFactory.cs
View File

@ -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;

2
src/keepass2android/search/SearchResults.cs
View File

@ -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);