Skip to content

GitLab

Commit d763f8f3 authored by Tobias's avatar Tobias
Browse files
Options

add reachability alerts to watch if session is not reachable

parent 2f079e32
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 46 deletions
VLC WatchKit Extension.entitlements 0 → 100644
View file @ d763f8f3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.org.videolan.vlc-ios</string>
</array>
</dict>
</plist>
VLC WatchKit Native Extension/Classes/VLCDetailInterfaceController.m
View file @ d763f8f3
......@@ -96,12 +96,11 @@
payload:currentObjectURI.absoluteString];
[self updateUserActivity:@"org.videolan.vlc-ios.playing" userInfo:@{@"playingmedia":currentObjectURI} webpageURL:nil];
[[WCSession defaultSession] sendMessage:dict replyHandler:^(NSDictionary<NSString *,id> * _Nonnull replyMessage) {
[self showNowPlaying:nil];
} errorHandler:^(NSError * _Nonnull error) {
// TODO: error handling
}];
[self vlc_performBlockIfSessionReachable:^{
[[WCSession defaultSession] sendMessage:dict replyHandler:^(NSDictionary<NSString *,id> * _Nonnull replyMessage) {
[self showNowPlaying:nil];
} errorHandler:nil];
} showUnreachableAlert:YES];
}
- (void)setMediaTitle:(NSString *)mediaTitle {
......
VLC WatchKit Native Extension/Classes/VLCNowPlayingInterfaceController.m
View file @ d763f8f3
......@@ -48,12 +48,17 @@ static NSString *const VLCNowPlayingUpdateNotification = @"VLCPlaybackController
self.durationLabel.accessibilityLabel = NSLocalizedString(@"DURATION", nil);
self.titleLabel.accessibilityLabel = NSLocalizedString(@"TITLE", nil);
self.volume = -1.0;
[self setPlaying:YES];
[self requestNowPlayingInfo];
[self vlc_performBlockIfSessionReachable:nil showUnreachableAlert:YES alertOKAction:^{
[self dismissController];
}];
}
// TODO: check if iPhone is connected when inteface controller activates and for each user action
- (void)willActivate {
// This method is called when watch view controller is about to be visible to user
......@@ -82,20 +87,22 @@ static NSString *const VLCNowPlayingUpdateNotification = @"VLCPlaybackController
// and use that user info dictionary
- (void)requestNowPlayingInfo {
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameGetNowPlayingInfo];
[[WCSession defaultSession] sendMessage:dict replyHandler:^(NSDictionary<NSString *,id> * _Nonnull replyInfo) {
MLFile *file = nil;
NSString *uriString = replyInfo[VLCWatchMessageKeyURIRepresentation];
if (uriString) {
NSURL *uriRepresentation = [NSURL URLWithString:uriString];
file = [MLFile fileForURIRepresentation:uriRepresentation];
}
[self updateWithNowPlayingInfo:replyInfo[@"nowPlayingInfo"] andFile:file];
NSNumber *currentVolume = replyInfo[@"volume"];
if (currentVolume) {
self.volume = currentVolume.floatValue;
}
} errorHandler:nil];
[self vlc_performBlockIfSessionReachable:^{
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameGetNowPlayingInfo];
[[WCSession defaultSession] sendMessage:dict replyHandler:^(NSDictionary<NSString *,id> * _Nonnull replyInfo) {
MLFile *file = nil;
NSString *uriString = replyInfo[VLCWatchMessageKeyURIRepresentation];
if (uriString) {
NSURL *uriRepresentation = [NSURL URLWithString:uriString];
file = [MLFile fileForURIRepresentation:uriRepresentation];
}
[self updateWithNowPlayingInfo:replyInfo[@"nowPlayingInfo"] andFile:file];
NSNumber *currentVolume = replyInfo[@"volume"];
if (currentVolume) {
self.volume = currentVolume.floatValue;
}
} errorHandler:nil];
} showUnreachableAlert:NO];
}
- (void)updateWithNowPlayingInfo:(NSDictionary*)nowPlayingInfo andFile:(MLFile*)file {
......@@ -137,43 +144,57 @@ static NSString *const VLCNowPlayingUpdateNotification = @"VLCPlaybackController
}
- (IBAction)playPausePressed {
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNamePlayPause];
[[WCSession defaultSession] sendMessage:dict replyHandler:^(NSDictionary<NSString *,id> * _Nonnull replyInfo) {
NSNumber *playing = replyInfo[@"playing"];
if ([playing isKindOfClass:[NSNumber class]]) {
self.playing = playing.boolValue;
} else {
self.playing = !self.playing;
}
} errorHandler:^(NSError * _Nonnull error) {
NSLog(@"playpause failed with error: %@",error);
}];
[self vlc_performBlockIfSessionReachable:^{
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNamePlayPause];
[[WCSession defaultSession] sendMessage:dict replyHandler:^(NSDictionary<NSString *,id> * _Nonnull replyInfo) {
NSNumber *playing = replyInfo[@"playing"];
if ([playing isKindOfClass:[NSNumber class]]) {
self.playing = playing.boolValue;
} else {
self.playing = !self.playing;
}
} errorHandler:^(NSError * _Nonnull error) {
NSLog(@"playpause failed with error: %@",error);
}];
} showUnreachableAlert:YES];
}
- (IBAction)skipForward {
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameSkipForward];
[[WCSession defaultSession] sendMessage:dict replyHandler:nil errorHandler:^(NSError * _Nonnull error) {
NSLog(@"skipForward failed with error: %@",error);
}];
[self vlc_performBlockIfSessionReachable:^{
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameSkipForward];
[[WCSession defaultSession] sendMessage:dict replyHandler:nil errorHandler:^(NSError * _Nonnull error) {
NSLog(@"skipForward failed with error: %@",error);
}];
} showUnreachableAlert:YES];
}
- (IBAction)skipBackward {
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameSkipBackward];
[[WCSession defaultSession] sendMessage:dict replyHandler:nil errorHandler:^(NSError * _Nonnull error) {
NSLog(@"skipBackward failed with error: %@",error);
}];
[self vlc_performBlockIfSessionReachable:^{
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameSkipBackward];
[[WCSession defaultSession] sendMessage:dict replyHandler:nil errorHandler:^(NSError * _Nonnull error) {
NSLog(@"skipBackward failed with error: %@",error);
}];
} showUnreachableAlert:YES];
}
- (IBAction)volumeSliderChanged:(float)value {
_volume = value;
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameSetVolume
payload:@(value)];
[[WCSession defaultSession] sendMessage:dict replyHandler:nil errorHandler:^(NSError * _Nonnull error) {
NSLog(@"setVolume failed with error: %@",error);
}];
[self vlc_performBlockIfSessionReachable:^{
NSDictionary *dict = [VLCWatchMessage messageDictionaryForName:VLCWatchMessageNameSetVolume
payload:@(value)];
[[WCSession defaultSession] sendMessage:dict replyHandler:nil errorHandler:^(NSError * _Nonnull error) {
NSLog(@"setVolume failed with error: %@",error);
}];
} showUnreachableAlert:YES];
}
#pragma mark value comparing setters -
- (void)setVolume:(float)volume
{
if (_volume != volume) {
......
VLC WatchKit Native Extension/Classes/WKInterfaceController+VLCConnectionAlert.h 0 → 100644
View file @ d763f8f3
/*****************************************************************************
* WKInterfaceController+VLCConnectionAlert.h
* VLC for iOS
*****************************************************************************
* Copyright (c) 2015 VideoLAN. All rights reserved.
* $Id$
*
* Author: Tobias Conradi <videolan # tobias-conradi.de>
*
* Refer to the COPYING file of the official project for license.
*****************************************************************************/
#import <WatchKit/WatchKit.h>
@interface WKInterfaceController (VLCConnectionAlert)
/*+*
* Same as method below, with nil as default okActionBlock
***/
- (void)vlc_performBlockIfSessionReachable:(void(^__nullable)())reachableBlock
showUnreachableAlert:(BOOL)unreachableAlert;
/*+*
* check if the default session is reachable ^== iPhone connected to Watch
* If the session is reachable, perform the block.
* If the session is unreachable, show a unreachable alert if unreachable alert
* is true.
* okActionBlock is executed if the session is unreachable, the alert was
* presented and the user pressed the ok button.
***/
- (void)vlc_performBlockIfSessionReachable:(void(^__nullable)())reachableBlock
showUnreachableAlert:(BOOL)unreachableAlert
alertOKAction:(void(^__nullable)())okActionBlock;
@end
VLC WatchKit Native Extension/Classes/WKInterfaceController+VLCConnectionAlert.m 0 → 100644
View file @ d763f8f3
/*****************************************************************************
* WKInterfaceController+VLCConnectionAlert.m
* VLC for iOS
*****************************************************************************
* Copyright (c) 2015 VideoLAN. All rights reserved.
* $Id$
*
* Author: Tobias Conradi <videolan # tobias-conradi.de>
*
* Refer to the COPYING file of the official project for license.
*****************************************************************************/
#import "WKInterfaceController+VLCConnectionAlert.h"
#import <WatchConnectivity/WatchConnectivity.h>
@implementation WKInterfaceController (VLCConnectionAlert)
- (void)vlc_performBlockIfSessionReachable:(void(^__nullable)())reachableBlock showUnreachableAlert:(BOOL)unreachableAlert {
[self vlc_performBlockIfSessionReachable:reachableBlock showUnreachableAlert:unreachableAlert alertOKAction:nil];
}
- (void)vlc_performBlockIfSessionReachable:(void(^__nullable)())reachableBlock showUnreachableAlert:(BOOL)unreachableAlert alertOKAction:(void (^ _Nullable)())okActionBlock {
BOOL isReachable = [[WCSession defaultSession] isReachable];
if (!isReachable && unreachableAlert) {
WKAlertAction *okAction = [WKAlertAction actionWithTitle:NSLocalizedString(@"BUTTON_OK", nil)
style:WKAlertActionStyleDefault
handler:^{
if (okActionBlock) {
okActionBlock();
}
}];
[self presentAlertControllerWithTitle:NSLocalizedString(@"NOT_CONNECTED_TO_PHONE_TITLE", nil)
message:NSLocalizedString(@"NOT_CONNECTED_TO_PHONE_MESSAGE", nil)
preferredStyle:WKAlertControllerStyleAlert
actions:@[okAction]];
return;
} else if (isReachable && reachableBlock) {
reachableBlock();
}
}
@end
VLC WatchKit Native Extension/VLC for iOS WatchKit Extension-Prefix.pch
View file @ d763f8f3
......@@ -23,6 +23,7 @@
#import <MediaLibraryKit/MediaLibraryKit.h>
#import "WKInterfaceController+VLCConnectionAlert.h"
#ifndef NDEBUG
#define APLog(format, ...) NSLog(format, ## __VA_ARGS__)
......
VLC WatchKit Native Extension/en.lproj/Localizable.strings
View file @ d763f8f3
......@@ -17,6 +17,12 @@
"DURATION"="Duration";
"TITLE"="Title";
"BUTTON_OK"="OK";
"NOT_CONNECTED_TO_PHONE_TITLE"="Not connected to iPhone";
"NOT_CONNECTED_TO_PHONE_MESSAGE"="Please connect your iPhone to perform remote control actions.";
// accessibility labels for the playlist
"OBJECT_TYPE_SHOW"="Show";
"OBJECT_TYPE_SHOW_EPISODE"="Show episode";
......
VLC for iOS.xcodeproj/project.pbxproj
View file @ d763f8f3
......@@ -252,6 +252,7 @@
DD7BA2631B680C8E002D9F54 /* MediaLibraryKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD7BA2601B680C1B002D9F54 /* MediaLibraryKit.framework */; };
DD7BA2641B680C8E002D9F54 /* MediaLibraryKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD7BA2601B680C1B002D9F54 /* MediaLibraryKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DD8F84311B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m in Sources */ = {isa = PBXBuildFile; fileRef = DD8F84301B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m */; };
DDB7C6A41BAEB28200E6570E /* WKInterfaceController+VLCConnectionAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = DD9FBE761BAD6BB600FFE77A /* WKInterfaceController+VLCConnectionAlert.m */; settings = {ASSET_TAGS = (); }; };
DDB959421AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = DDB959411AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel */; };
DDC10BE41AEE8EA700890DC3 /* VLCTimeNavigationTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = DDC10BE31AEE8EA700890DC3 /* VLCTimeNavigationTitleView.m */; };
E0C04F951A25B4410080331A /* VLCDocumentPickerController.m in Sources */ = {isa = PBXBuildFile; fileRef = E0C04F941A25B4410080331A /* VLCDocumentPickerController.m */; };
......@@ -786,6 +787,9 @@
DD8C8FAE1B676D8500B3C4EE /* VLC WatchKit Extension-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "VLC WatchKit Extension-Bridging-Header.h"; sourceTree = "<group>"; };
DD8F842F1B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "VLCPlaybackController+MediaLibrary.h"; path = "Sources/VLCPlaybackController+MediaLibrary.h"; sourceTree = SOURCE_ROOT; };
DD8F84301B00EB3B0009138A /* VLCPlaybackController+MediaLibrary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "VLCPlaybackController+MediaLibrary.m"; path = "Sources/VLCPlaybackController+MediaLibrary.m"; sourceTree = SOURCE_ROOT; };
DD9FBE751BAD6BB600FFE77A /* WKInterfaceController+VLCConnectionAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WKInterfaceController+VLCConnectionAlert.h"; sourceTree = "<group>"; };
DD9FBE761BAD6BB600FFE77A /* WKInterfaceController+VLCConnectionAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WKInterfaceController+VLCConnectionAlert.m"; sourceTree = "<group>"; };
DD9FBE791BADA8E300FFE77A /* VLC WatchKit Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "VLC WatchKit Extension.entitlements"; sourceTree = "<group>"; };
DDB959411AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; name = MappingModel_2_5_to_2_6.xcmappingmodel; path = ImportedSources/MediaLibraryKit/MappingModel_2_5_to_2_6.xcmappingmodel; sourceTree = "<group>"; };
DDC10BE21AEE8EA700890DC3 /* VLCTimeNavigationTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCTimeNavigationTitleView.h; path = Sources/VLCTimeNavigationTitleView.h; sourceTree = SOURCE_ROOT; };
DDC10BE31AEE8EA700890DC3 /* VLCTimeNavigationTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCTimeNavigationTitleView.m; path = Sources/VLCTimeNavigationTitleView.m; sourceTree = SOURCE_ROOT; };
......@@ -1278,6 +1282,7 @@
7D94FCD216DE7D1000F2623B = {
isa = PBXGroup;
children = (
DD9FBE791BADA8E300FFE77A /* VLC WatchKit Extension.entitlements */,
7D8E19271B6BC186000D7C74 /* VLC WatchKit App.entitlements */,
DDB959411AFBB30500BB8CFF /* MappingModel_2_5_to_2_6.xcmappingmodel */,
7D31719C19FEC91F0019357A /* VLC for iOS.entitlements */,
......@@ -1710,6 +1715,8 @@
DD3567EC1B6768FC00338947 /* VLCWatchTableController.m */,
DD3567ED1B6768FC00338947 /* WKInterfaceObject+VLCProgress.h */,
DD3567EE1B6768FC00338947 /* WKInterfaceObject+VLCProgress.m */,
DD9FBE751BAD6BB600FFE77A /* WKInterfaceController+VLCConnectionAlert.h */,
DD9FBE761BAD6BB600FFE77A /* WKInterfaceController+VLCConnectionAlert.m */,
);
path = Classes;
sourceTree = "<group>";
......@@ -1851,6 +1858,11 @@
DD35676F1B6760BF00338947 = {
CreatedOnToolsVersion = 7.0;
DevelopmentTeam = 75GAHG3SZQ;
SystemCapabilities = {
com.apple.ApplicationGroups.iOS = {
enabled = 1;
};
};
};
};
};
......@@ -2198,6 +2210,7 @@
DD3567F81B6768FC00338947 /* VLCWatchTableController.m in Sources */,
DD3567F61B6768FC00338947 /* VLCPlaylistInterfaceController.m in Sources */,
DD2789E51B67A8F000CED769 /* MLMediaLibrary+playlist.m in Sources */,
DDB7C6A41BAEB28200E6570E /* WKInterfaceController+VLCConnectionAlert.m in Sources */,
DD3567F31B6768FC00338947 /* VLCDetailInterfaceController.m in Sources */,
DD2789DE1B67A5CD00CED769 /* VLCWatchMessage.m in Sources */,
DD3567F71B6768FC00338947 /* VLCRowController.m in Sources */,
......@@ -2833,6 +2846,7 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_ENTITLEMENTS = "VLC WatchKit Extension.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
......@@ -2880,6 +2894,7 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_ENTITLEMENTS = "VLC WatchKit Extension.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
......@@ -2927,6 +2942,7 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_ENTITLEMENTS = "VLC WatchKit Extension.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment