Implement areNotificationsEnabled

scottrules44 · scottrules44 · commit 20282d76e873 · 2024-09-07T17:07:00.000-05:00
Based on DimaUndSo Pull Request
diff --git a/docs/notifications-v2/areNotificationsEnabled.markdown b/docs/notifications-v2/areNotificationsEnabled.markdown
@@ -0,0 +1,28 @@
+# notifications.areNotificationsEnabled()
+
+> --------------------- ------------------------------------------------------------------------------------------
+> __Type__				[Function][api.type.Function]
+> __Return value__		[String][api.type.String]
+> __Revision__			[REVISION_LABEL](REVISION_URL)
+> __Keywords__			notification, notifications, subscribe
+> __See also__			[notifications.*][plugin.notifications-v2]
+> --------------------- ------------------------------------------------------------------------------------------
+
+
+## Overview
+
+Returns true if notifications for the app are enabled, or false if not.
+
+
+## Syntax
+
+	notifications.areNotificationsEnabled()
+
+
+## Example
+
+``````lua
+local notifications = require( "plugin.notifications.v2" )
+
+print( notifications.areNotificationsEnabled() )
+``````
diff --git a/docs/notifications-v2/index.markdown b/docs/notifications-v2/index.markdown
@@ -39,6 +39,7 @@ For Android, all __new__ apps, or existing apps being updated with push notifica
 
 #### [notifications.registerForPushNotifications()][plugin.notifications-v2.registerForPushNotifications]
 
+#### [notifications.areNotificationsEnabled()][plugin.notifications-v2.areNotificationsEnabled]
 
 ## Project Settings
 
diff --git a/plugins/2023.3693/android/.DS_Store b/plugins/2023.3693/android/.DS_Store
diff --git a/plugins/2023.3693/android/plugin-notifications-v2.aar b/plugins/2023.3693/android/plugin-notifications-v2.aar
diff --git a/plugins/2023.3693/iphone-sim/libNotificationsV2Plugin.a b/plugins/2023.3693/iphone-sim/libNotificationsV2Plugin.a
diff --git a/plugins/2023.3693/iphone/libNotificationsV2Plugin.a b/plugins/2023.3693/iphone/libNotificationsV2Plugin.a
diff --git a/plugins/2023.3693/iphone/metadata.lua b/plugins/2023.3693/iphone/metadata.lua
@@ -10,5 +10,4 @@ local metadata =
 	}
 }
 
-
 return metadata
diff --git a/plugins/2023.3693/mac-sim/plugin_notifications_v2.lua b/plugins/2023.3693/mac-sim/plugin_notifications_v2.lua
@@ -42,6 +42,10 @@ function lib.cancelNotification()
     showWarning("notifications.cancelNotification()")
 end
 
+function lib.areNotificationsEnabled()
+    showWarning("notifications.areNotificationsEnabled()")
+end
+
 -------------------------------------------------------------------------------
 -- END
 -------------------------------------------------------------------------------
diff --git a/plugins/2023.3693/win32-sim/plugin_notifications_v2.lua b/plugins/2023.3693/win32-sim/plugin_notifications_v2.lua
@@ -42,6 +42,10 @@ function lib.cancelNotification()
     showWarning("notifications.cancelNotification()")
 end
 
+function lib.areNotificationsEnabled()
+    showWarning("notifications.areNotificationsEnabled()")
+end
+
 -------------------------------------------------------------------------------
 -- END
 -------------------------------------------------------------------------------
diff --git a/src/Corona/main.lua b/src/Corona/main.lua
@@ -277,7 +277,7 @@ local subTitle = display.newText {
 subTitle:setTextColor( 0.2, 0.2, 0.2 )
 subTitle.x, subTitle.y = display.contentCenterX, 60
 
-eventDataTextBox = native.newTextBox( display.contentCenterX, display.contentHeight - 50, display.contentWidth - 10, 100)
+eventDataTextBox = native.newTextBox( display.contentCenterX, display.contentHeight - 20, display.contentWidth - 10, 100)
 eventDataTextBox.placeholder = "Event data will appear here"
 eventDataTextBox.hasBackground = false
 
@@ -314,7 +314,7 @@ local subscribeToNewsTopic = widget.newButton {
         notifications.subscribe("news")
     end
 }
-subscribeToNewsTopic.x, subscribeToNewsTopic.y = display.contentCenterX, 150
+subscribeToNewsTopic.x, subscribeToNewsTopic.y = display.contentCenterX, 130
 
 local unsubscribeFromNewsTopic = widget.newButton {
     label = "Unsubscribe from News",
@@ -367,6 +367,17 @@ local getDeviceTokenButton = widget.newButton {
 }
 getDeviceTokenButton.x, getDeviceTokenButton.y = display.contentCenterX, cancelLocalNotification.y + 60
 
+local areNotificationsEnabledButton = widget.newButton {
+    label = "Are notifications enabled",
+    width = 200,
+    height = 40,
+    labelColor = { default={ 0, 0, 0 }, over={ 0.7, 0.7, 0.7 } },
+    onRelease = function(event)
+        print("notifications enabled", notifications.areNotificationsEnabled())
+    end
+}
+areNotificationsEnabledButton.x, areNotificationsEnabledButton.y = display.contentCenterX, getDeviceTokenButton.y + 40
+
 -- local notifications: check for launch args and call listener
 if ( launchArgs and launchArgs.notification ) then
     print(">>>> launching app from notification...")
diff --git a/src/android/plugin/src/main/java/plugin/notifications/v2/LuaLoader.java b/src/android/plugin/src/main/java/plugin/notifications/v2/LuaLoader.java
@@ -26,6 +26,10 @@
 import com.naef.jnlua.NamedJavaFunction;
 import java.util.concurrent.TimeUnit;
 
+import android.app.NotificationManager;
+import android.content.Context;
+
+
 /**
  * Implements the Lua interface for the plugin.
  * <p>
@@ -184,7 +188,8 @@ public int invoke(LuaState L) {
                 new Subscribe(),
                 new Unsubscribe(),
                 new ScheduleNotification(),
-                new CancelNotification()
+                new CancelNotification(),
+                new AreNotificationsEnabled()  // New function
         };
         String libName = L.toString(1);
         L.register(libName, luaFunctions);
@@ -569,4 +574,53 @@ public int invoke(final LuaState luaState) {
             return 0;
         }
     }
+
+    // New method to check if notifications are enabled
+    // [Lua] areNotificationsEnabled()
+    private class AreNotificationsEnabled implements NamedJavaFunction {
+        /**
+         * Gets the name of the Lua function as it would appear in the Lua script.
+         *
+         * @return Returns the name of the custom Lua function.
+         */
+        @Override
+        public String getName() {
+            return "areNotificationsEnabled";
+        }
+
+        /**
+         * This method is called when the Lua function is called.
+         *
+         * @param L Reference to the Lua state.
+         * @return Returns 1 value: boolean indicating if notifications are enabled.
+         */
+        @Override
+        public int invoke(final LuaState L) {
+            functionSignature = "notifications.areNotificationsEnabled()";
+
+            // Get application context
+            Context context = CoronaEnvironment.getApplicationContext();
+
+            // Check if notifications are enabled for the app
+            boolean areEnabled = false;
+
+            try {
+                NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                    // For Android O and above, check the notification channel settings
+                    areEnabled = notificationManager.getImportance() != NotificationManager.IMPORTANCE_NONE;
+                } else {
+                    // For versions below Android O
+                    areEnabled = notificationManager.areNotificationsEnabled();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            // Push the result back to Lua
+            L.pushBoolean(areEnabled);
+            return 1;
+        }
+    }
 }
diff --git a/src/ios/NotificationsV2.xcodeproj/project.pbxproj b/src/ios/NotificationsV2.xcodeproj/project.pbxproj
@@ -942,6 +942,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				"GCC_THUMB_SUPPORT[arch=armv6]" = "";
 				INFOPLIST_FILE = "App-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.coronalabs.firebase.messaging;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -970,6 +971,7 @@
 				GCC_PREFIX_HEADER = Prefix.pch;
 				"GCC_THUMB_SUPPORT[arch=armv6]" = "";
 				INFOPLIST_FILE = "App-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.coronalabs.firebase.messaging;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/src/ios/Plugin.xcodeproj/project.pbxproj b/src/ios/Plugin.xcodeproj/project.pbxproj
@@ -291,7 +291,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -337,7 +337,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/src/ios/Plugin/NotificationsV2Plugin.mm b/src/ios/Plugin/NotificationsV2Plugin.mm
@@ -80,6 +80,7 @@ @interface CoronaNotificationsPluginDelegate: NSObject <UNUserNotificationCenter
         static int cancelNotification( lua_State *L );
         static int subscribe( lua_State *L );
         static int unsubscribe( lua_State *L );
+        static int areNotificationsEnabled( lua_State *L ); // New Function
 
     private: // internal helper functions
         static void logMsg( lua_State *L, NSString *msgType,  NSString *errorMsg );
@@ -183,6 +184,7 @@ static bool isFirebaseLinked() {
             {"getDeviceToken", getDeviceToken},
             {"subscribe", subscribe},
             {"unsubscribe", unsubscribe},
+            {"areNotificationsEnabled", areNotificationsEnabled}, // New Function
 			{NULL, NULL}
         };
 
@@ -197,6 +199,39 @@ static bool isFirebaseLinked() {
 	return 1;
 }
 
+// New method to check if notifications are enabled
+int
+NotificationsV2Plugin::areNotificationsEnabled(lua_State *L)
+{
+    Self *context = ToLibrary(L);
+    
+    if (!context) {
+        return 0;
+    }
+    
+    Self& library = *context;
+    
+    library.functionSignature = @"notifications.areNotificationsEnabled()";
+    
+    __block BOOL enabled = NO;
+    
+    if (@available(iOS 10.0, *)) {
+        dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+        [[UNUserNotificationCenter currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
+            enabled = (settings.authorizationStatus == UNAuthorizationStatusAuthorized);
+            dispatch_semaphore_signal(semaphore);
+        }];
+        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+    } else {
+        // Fallback for iOS 9 and lower
+        UIUserNotificationSettings *settings = [[UIApplication sharedApplication] currentUserNotificationSettings];
+        enabled = (settings.types != UIUserNotificationTypeNone);
+    }
+    
+    lua_pushboolean(L, enabled);
+    return 1;
+}
+
 int
 NotificationsV2Plugin::Finalizer( lua_State *L )
 {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ For Android, all __new__ apps, or existing apps being updated with push notifica`
`39`	`39`
`40`	`40`	`#### [notifications.registerForPushNotifications()][plugin.notifications-v2.registerForPushNotifications]`
`41`	`41`
	`42`	`+#### [notifications.areNotificationsEnabled()][plugin.notifications-v2.areNotificationsEnabled]`
`42`	`43`
`43`	`44`	`## Project Settings`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,4 @@ local metadata =`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`-`
`14`	`13`	`return metadata`