nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-19 20:19:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed custom OTP entry category since KeePassKit now has all we need

Browse Source
This commit is contained in:
Michael Starke
2020-12-12 14:00:33 +01:00
parent bb73628484
commit fa85da3f82
6 changed files with 1 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MacPass.xcodeproj/project.pbxproj
View File

@@ -239,7 +239,6 @@
4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; };
4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; };
4CAD8AA622CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD8AA422CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m */; };
4CB11241256EB77900204D1B /* KPKEntry+OTP.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB11240256EB77900204D1B /* KPKEntry+OTP.m */; };
4CB33F861EAF54A000C9341E /* KPKNode+MPIsHistory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CB33F851EAF54A000C9341E /* KPKNode+MPIsHistory.m */; };
4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4CB9339716D3A0DD00A13B5D /* Credits.rtf */; };
4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */; };
@@ -801,8 +800,6 @@
4CAD748D15B88AC100104512 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
4CAD8AA322CF397B0090B2DD /* MPAutotypeDoctorReportViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAutotypeDoctorReportViewController.h; sourceTree = "<group>"; };
4CAD8AA422CF397B0090B2DD /* MPAutotypeDoctorReportViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeDoctorReportViewController.m; sourceTree = "<group>"; };
4CB1123F256EB77900204D1B /* KPKEntry+OTP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KPKEntry+OTP.h"; sourceTree = "<group>"; };
4CB11240256EB77900204D1B /* KPKEntry+OTP.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "KPKEntry+OTP.m"; sourceTree = "<group>"; };
4CB33F841EAF54A000C9341E /* KPKNode+MPIsHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KPKNode+MPIsHistory.h"; sourceTree = "<group>"; };
4CB33F851EAF54A000C9341E /* KPKNode+MPIsHistory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KPKNode+MPIsHistory.m"; sourceTree = "<group>"; };
4CB63A6018986530002DEC4C /* MPFlagsHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPFlagsHelper.h; sourceTree = "<group>"; };
@@ -1213,8 +1210,6 @@
4C0949581FD6B89B004F2971 /* NSUserNotification+MPAdditions.m */,
4C6BF0742559BD4800E5812A /* KPKBinary+MacPassAddtions.h */,
4C6BF0752559BD4800E5812A /* KPKBinary+MacPassAddtions.m */,
4CB1123F256EB77900204D1B /* KPKEntry+OTP.h */,
4CB11240256EB77900204D1B /* KPKEntry+OTP.m */,
4C35663E25824C0A00CAB95B /* NSImage+MPQRCode.h */,
4C35663F25824C0A00CAB95B /* NSImage+MPQRCode.m */,
);
@@ -2218,7 +2213,6 @@
4CE298EB1795FC2A00DF7BDB /* MPEntryContextMenuDelegate.m in Sources */,
4CCCE8011D75CA48006AA951 /* MPArrayController.m in Sources */,
4CC0D2CE17974A47000B4BDA /* MPCustomFieldTableViewDelegate.m in Sources */,
4CB11241256EB77900204D1B /* KPKEntry+OTP.m in Sources */,
4CC0D2D117974A5A000B4BDA /* MPAttachmentTableViewDelegate.m in Sources */,
4C26C33F18D8C92100CF1A1C /* MPTemporaryFileStorage.m in Sources */,
4C663D411D6D91A900CB6237 /* MPNumberFormatter.m in Sources */,

19
MacPass/KPKEntry+OTP.h
View File

@@ -1,19 +0,0 @@
//
// KPKEntry+OTP.h
// MacPass
//
// Created by Michael Starke on 25.11.20.
// Copyright © 2020 HicknHack Software GmbH. All rights reserved.
//
#import <KeePassKit/KeePassKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface KPKEntry (OTP)
@property (readonly, assign, nonatomic) BOOL hasTOTP;
@end
NS_ASSUME_NONNULL_END

25
MacPass/KPKEntry+OTP.m
View File

@@ -1,25 +0,0 @@
//
// KPKEntry+OTP.m
// MacPass
//
// Created by Michael Starke on 25.11.20.
// Copyright © 2020 HicknHack Software GmbH. All rights reserved.
//
#import "KPKEntry+OTP.h"
@implementation KPKEntry (OTP)
+ (NSSet<NSString *> *)keyPathsForValuesAffectingHasTOTP {
return [NSSet setWithObject:NSStringFromSelector(@selector(attributes))];
}
- (BOOL)hasTOTP {
BOOL hasURLKey = [self hasAttributeWithKey:kKPKAttributeKeyOTPOAuthURL];
BOOL hasSeedKey = [self hasAttributeWithKey:kKPKAttributeKeyTimeOTPSeed];
BOOL hasSettingsKey = [self hasAttributeWithKey:kKPKAttributeKeyTimeOTPSettings];
return(hasURLKey || (hasSeedKey && hasSettingsKey));
}
@end

1
MacPass/MPAddCustomFieldContextMenuDelegate.m
View File

@@ -23,7 +23,6 @@
#import "MPAddCustomFieldContextMenuDelegate.h"
#import "KeePassKit/KeePassKit.h"
#import "KPKEntry+OTP.h"
/*
HmacOtp-Secret (the UTF-8 representation of the value is the secret),

2
MacPass/MPEntryInspectorViewController.m
View File

@@ -49,8 +49,6 @@
#import "MPArrayController.h"
#import "KPKEntry+OTP.h"
#import "KeePassKit/KeePassKit.h"
#import "HNHUi/HNHUi.h"

4
MacPass/MPTOTPViewController.m
View File

@@ -8,8 +8,6 @@
#import "MPTOTPViewController.h"
#import "KPKEntry+OTP.h"
#import <KeePassKit/KeePassKit.h>
@interface MPTOTPViewController ()
@@ -45,7 +43,7 @@
- (void)_updateDisplay {
KPKEntry *entry = (KPKEntry *)self.representedObject;
BOOL showTOTP = entry.hasTOTP;
BOOL showTOTP = entry.hasTimeOTP;
self.view.hidden = !showTOTP;
if(showTOTP) {
self.remainingTimeProgressIndicator.indeterminate = YES;