Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a USB device blocking popup. #728

Merged
merged 13 commits into from
Feb 28, 2022
Merged

Add a USB device blocking popup. #728

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ac8cc57
Add a USB device blocking popup.
tnek Jan 26, 2022
60806cb
Merge branch 'main' into blocknotify
tnek Feb 11, 2022
4f8f4b3
Add the configuration keys for custom block messages and resize window
tnek Feb 14, 2022
1e1e471
Merge branch 'main' into blocknotify
tnek Feb 14, 2022
260a36f
Modify visual appearance of the popup to be more compact
tnek Feb 15, 2022
c8f4b43
Hide the remounted args details if set to pure block mode
tnek Feb 15, 2022
56bb606
Conversion to human-readable remount args for a few of them
tnek Feb 15, 2022
272ddbb
Merge branch 'main' into blocknotify
tnek Feb 15, 2022
ff7f118
Merge branch 'main' into blocknotify
tnek Feb 24, 2022
021126a
Updated with review comments from mlw
tnek Feb 25, 2022
f945d4b
Move the default block message to SNTConfigurator's accessor
tnek Feb 25, 2022
e1b7763
Add a custom SNTDeviceEvent initializer
tnek Feb 25, 2022
a8af99a
Fix clang-format
tnek Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a custom SNTDeviceEvent initializer
  • Loading branch information
@tnek
tnek committed Feb 25, 2022
commit e1b77639acb54681deaef9526ac1a28f8ead37ad
2 changes: 2 additions & 0 deletions Source/common/SNTDeviceEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

@interface SNTDeviceEvent : NSObject <NSSecureCoding>

- (instancetype)initWithOnName:(NSString *)mntonname fromName:(NSString *)mntfromname;
tnek marked this conversation as resolved.
Show resolved Hide resolved

@property NSString *mntonname;
@property NSString *mntfromname;
@property NSArray<NSString *> *remountArgs;
Expand Down
9 changes: 9 additions & 0 deletions Source/common/SNTDeviceEvent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ @implementation SNTDeviceEvent
[decoder decodeObjectOfClasses:[NSSet setWithObjects:[NSArray class], [cls class], nil] \
forKey:key]

- (instancetype)initWithOnName:(NSString *)mntonname fromName:(NSString *)mntfromname {
self = [super init];
if (self) {
_mntonname = mntonname;
_mntfromname = mntfromname;
}
return self;
}

+ (BOOL)supportsSecureCoding {
return YES;
}
Expand Down
7 changes: 4 additions & 3 deletions Source/santad/EventProviders/SNTDeviceManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,10 @@ - (void)handleAuthMount:(const es_message_t *)m
return;
}

SNTDeviceEvent *event = [[SNTDeviceEvent alloc] init];
event.mntonname = [NSString stringWithUTF8String:m->event.mount.statfs->f_mntonname];
event.mntfromname = [NSString stringWithUTF8String:m->event.mount.statfs->f_mntfromname];
SNTDeviceEvent *event = [[SNTDeviceEvent alloc]
initWithOnName:[NSString stringWithUTF8String:m->event.mount.statfs->f_mntonname]
fromName:[NSString stringWithUTF8String:m->event.mount.statfs->f_mntfromname]];

BOOL shouldRemount = self.remountArgs != nil && [self.remountArgs count] > 0;

if (shouldRemount) {
Expand Down