mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Platform: Remove deprecated code paths that will never be called

Browse source
This commit is contained in:
reuk 2024-07-03 14:50:08 +01:00
parent 5cdf6abf95
commit a858f91354
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
6 changed files with 54 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

146
modules/juce_gui_extra/native/juce_PushNotifications_ios.cpp
View file

@ -74,31 +74,6 @@ struct PushNotificationsDelegateDetails
}
//==============================================================================
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
static UILocalNotification* juceNotificationToUILocalNotification (const PushNotifications::Notification& n)
{
auto notification = [[UILocalNotification alloc] init];
notification.alertTitle = juceStringToNS (n.title);
notification.alertBody = juceStringToNS (n.body);
notification.category = juceStringToNS (n.category);
notification.applicationIconBadgeNumber = n.badgeNumber;
auto triggerTime = Time::getCurrentTime() + RelativeTime (n.triggerIntervalSec);
notification.fireDate = [NSDate dateWithTimeIntervalSince1970: (double) triggerTime.toMilliseconds() / 1000.0];
notification.userInfo = varToNSDictionary (n.properties);
auto soundToPlayString = n.soundToPlay.toString (true);
if (soundToPlayString == "default_os_sound")
notification.soundName = UILocalNotificationDefaultSoundName;
else if (soundToPlayString.isNotEmpty())
notification.soundName = juceStringToNS (soundToPlayString);
return notification;
}
JUCE_END_IGNORE_WARNINGS_GCC_LIKE
static UNNotificationRequest* juceNotificationToUNNotificationRequest (const PushNotifications::Notification& n)
{
// content
@ -118,8 +93,8 @@ struct PushNotificationsDelegateDetails
else if (soundToPlayString.isNotEmpty())
content.sound = [UNNotificationSound soundNamed: juceStringToNS (soundToPlayString)];
auto* propsDict = (NSMutableDictionary*) varToNSDictionary (n.properties);
[propsDict setObject: juceStringToNS (soundToPlayString) forKey: nsStringLiteral ("com.juce.soundName")];
auto* propsDict = (NSMutableDictionary*) [varToNSDictionary (n.properties) mutableCopy];
[propsDict setObject: juceStringToNS (soundToPlayString) forKey: @"com.juce.soundName"];
content.userInfo = propsDict;
// trigger
@ -245,59 +220,6 @@ struct PushNotificationsDelegateDetails
return unNotificationRequestToJuceNotification (n.request);
}
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
static PushNotifications::Notification uiLocalNotificationToJuceNotification (UILocalNotification* n)
{
PushNotifications::Notification notif;
notif.title = nsStringToJuce (n.alertTitle);
notif.body = nsStringToJuce (n.alertBody);
if (n.fireDate != nil)
{
NSDate* dateNow = [NSDate date];
NSDate* fireDate = n.fireDate;
notif.triggerIntervalSec = [dateNow timeIntervalSinceDate: fireDate];
}
notif.soundToPlay = URL (nsStringToJuce (n.soundName));
notif.badgeNumber = (int) n.applicationIconBadgeNumber;
notif.category = nsStringToJuce (n.category);
notif.properties = nsDictionaryToVar (n.userInfo);
return notif;
}
static Action uiUserNotificationActionToAction (UIUserNotificationAction* a)
{
Action action;
action.identifier = nsStringToJuce (a.identifier);
action.title = nsStringToJuce (a.title);
action.style = a.behavior == UIUserNotificationActionBehaviorTextInput
? Action::text
: Action::button;
action.triggerInBackground = a.activationMode == UIUserNotificationActivationModeBackground;
action.destructive = a.destructive;
action.parameters = nsDictionaryToVar (a.parameters);
return action;
}
static Category uiUserNotificationCategoryToCategory (UIUserNotificationCategory* c)
{
Category category;
category.identifier = nsStringToJuce (c.identifier);
for (UIUserNotificationAction* a in [c actionsForContext: UIUserNotificationActionContextDefault])
category.actions.add (uiUserNotificationActionToAction (a));
return category;
}
JUCE_END_IGNORE_WARNINGS_GCC_LIKE
static Action unNotificationActionToAction (UNNotificationAction* a)
{
Action action;
@ -591,46 +513,6 @@ private:
completionHandler();
}
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
void didRegisterUserNotificationSettings (UIUserNotificationSettings*)
{
requestSettingsUsed();
}
void didReceiveLocalNotification (UILocalNotification* notification)
{
auto n = PushNotificationsDelegateDetails::uiLocalNotificationToJuceNotification (notification);
owner.listeners.call ([&] (Listener& l) { l.handleNotification (true, n); });
}
void handleActionForLocalNotificationCompletionHandler (NSString* actionIdentifier,
UILocalNotification* notification,
void (^completionHandler)())
{
handleActionForLocalNotificationWithResponseCompletionHandler (actionIdentifier,
notification,
nil,
completionHandler);
}
void handleActionForLocalNotificationWithResponseCompletionHandler (NSString* actionIdentifier,
UILocalNotification* notification,
NSDictionary* responseInfo,
void (^completionHandler)())
{
auto n = PushNotificationsDelegateDetails::uiLocalNotificationToJuceNotification (notification);
auto actionString = nsStringToJuce (actionIdentifier);
auto response = PushNotificationsDelegateDetails::getUserResponseFromNSDictionary (responseInfo);
owner.listeners.call ([&] (Listener& l) { l.handleNotificationAction (true, n, actionString, response); });
completionHandler();
}
JUCE_END_IGNORE_WARNINGS_GCC_LIKE
void willPresentNotificationWithCompletionHandler ([[maybe_unused]] UNNotification* notification,
void (^completionHandler)(UNNotificationPresentationOptions options))
{
@ -700,30 +582,6 @@ private:
getThis (self).handleActionForRemoteNotificationCompletionHandler (actionIdentifier, userInfo, responseInfo, completionHandler);
});
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
addMethod (@selector (application:didRegisterUserNotificationSettings:), [] (id self, SEL, UIApplication*, UIUserNotificationSettings* settingsToUse)
{
getThis (self).didRegisterUserNotificationSettings (settingsToUse);
});
addMethod (@selector (application:didReceiveLocalNotification:), [] (id self, SEL, UIApplication*, UILocalNotification* notification)
{
getThis (self).didReceiveLocalNotification (notification);
});
addMethod (@selector (application:handleActionWithIdentifier:forLocalNotification:completionHandler:), [] (id self, SEL, UIApplication*, NSString* actionIdentifier, UILocalNotification* notification, void (^completionHandler)())
{
getThis (self).handleActionForLocalNotificationCompletionHandler (actionIdentifier, notification, completionHandler);
});
addMethod (@selector (application:handleActionWithIdentifier:forLocalNotification:withResponseInfo:completionHandler:), [] (id self, SEL, UIApplication*, NSString* actionIdentifier, UILocalNotification* notification, NSDictionary* responseInfo, void (^completionHandler)())
{
getThis (self). handleActionForLocalNotificationWithResponseCompletionHandler (actionIdentifier, notification, responseInfo, completionHandler);
});
JUCE_END_IGNORE_WARNINGS_GCC_LIKE
addMethod (@selector (userNotificationCenter:willPresentNotification:withCompletionHandler:), [] (id self, SEL, UNUserNotificationCenter*, UNNotification* notification, void (^completionHandler)(UNNotificationPresentationOptions options))
{
getThis (self).willPresentNotificationWithCompletionHandler (notification, completionHandler);

4
modules/juce_gui_extra/native/juce_PushNotifications_mac.cpp
View file

@ -32,8 +32,6 @@
==============================================================================
*/
JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations")
namespace juce
{
@ -535,5 +533,3 @@ private:
};
} // namespace juce
JUCE_END_IGNORE_WARNINGS_GCC_LIKE