store ts in 'HasRequestedNotificationPermission'; declare as constant

e-mission · Oct 8, 2024 · e062604 · e062604
1 parent 153e3f2
commit e062604
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/android/verification/SensorControlForegroundDelegate.java b/src/android/verification/SensorControlForegroundDelegate.java
@@ -54,6 +54,7 @@
 
 public class SensorControlForegroundDelegate {
     public static final String TAG = "SensorPermissionsAndSettingsForegroundDelegate";
+    private static final String HAS_REQUESTED_NOTIFS_KEY = "HasRequestedNotificationPermission";
 
     private CordovaPlugin plugin = null;
     private CordovaInterface cordova = null;
@@ -777,8 +778,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         Log.d(mAct, TAG, requestCode + " is our code, handling callback");
         Log.d(mAct, TAG, "Got notification callback from launching app settings");
         JSONObject jo = new JSONObject();
-        jo.put("value", true);
-        UserCacheFactory.getUserCache(cordova.getActivity()).putLocalStorage("HasRequestedNotificationPermission", jo);
+        jo.put("ts", System.currentTimeMillis() / 1000);
+        UserCacheFactory.getUserCache(cordova.getActivity()).putLocalStorage(HAS_REQUESTED_NOTIFS_KEY, jo);
         if (SensorControlChecks.checkNotificationsEnabled(cordova.getActivity())) {
           SensorControlBackgroundChecker.restartFSMIfStartState(cordova.getActivity());
           cordovaCallback.success();

diff --git a/src/ios/Verification/SensorControlForegroundDelegate.m b/src/ios/Verification/SensorControlForegroundDelegate.m
@@ -5,6 +5,7 @@
 #import "BEMAppDelegate.h"
 #import "BEMActivitySync.h"
 #import "BEMBuiltinUserCache.h"
+#import "DataUtils.h"
 
 #import <CoreMotion/CoreMotion.h>
 
@@ -14,6 +15,8 @@ @interface SensorControlForegroundDelegate() {
 }
 @end
 
+static NSString* const HAS_REQUESTED_NOTIFS_KEY = @"HasRequestedNotificationPermission";
+
 @implementation SensorControlForegroundDelegate
 
 /*
@@ -260,7 +263,8 @@ -(void) didRecieveFitnessPermission:(BOOL)isPermitted
 - (void)checkAndPromptNotificationPermission {
     NSString* callbackId = [command callbackId];
     @try {
-        if ([[BuiltinUserCache database] getLocalStorage:@"HasRequestedNotificationPermission" withMetadata:NO] != NULL) {
+        // If we have prompted in the past, the popup will not work. Instead, we'll open app settings
+        if ([[BuiltinUserCache database] getLocalStorage:HAS_REQUESTED_NOTIFS_KEY withMetadata:NO] != NULL) {
             NSLog(@"Already prompted request for user notification. Launching app settings.");
             [AppDelegate registerForegroundDelegate:self];
             [self openAppSettings];
@@ -283,8 +287,9 @@ - (void)checkAndPromptNotificationPermission {
 }
 
 - (void) didRegisterUserNotificationSettings:(UIUserNotificationSettings*)newSettings {
-    [[BuiltinUserCache database] putLocalStorage:@"HasRequestedNotificationPermission"
-                                      jsonValue:@{ @"value" : @(TRUE) }];
+    NSDate* now = [NSDate date];
+    [[BuiltinUserCache database] putLocalStorage:HAS_REQUESTED_NOTIFS_KEY
+                                    jsonValue:@{ @"ts": @(now.timeIntervalSince1970) }];
     NSString* callbackId = [command callbackId];
     UIUserNotificationSettings* requestedSettings = [TripDiarySensorControlChecks REQUESTED_NOTIFICATION_TYPES];
     if (requestedSettings.types == newSettings.types) {