ignore resize event if unavailable

Author: phoddie

build/devices/pebble/modules/global/global.js

@@ -51,31 +51,31 @@ export class Pebble {
 		if (index < 0)
 			return;
 
-		if (!this.#events.has(event))
-			this.#events.set(event, [callback]);
-		else
-			this.#events.get(event).push(callback);
-
-		if (index <= 3) {
-			// immediate for first one
-			Timer.set(() => {
-				callback({date: new Date});
-			});
-
-			this.#schedule();
-			return;
-		}
+		const e = this.#events.getOrInsert(event, []);
 
-		switch (event) {
-			case "connected":
-				if (1 === this.#events.get(event).length)
+		switch (index) {
+			case 4:		// "connected":
+				if (!e.length)
 					connected(true);
 				break;
-			case "resize":
-				if (1 === this.#events.get(event).length)
-					obstructed(true);
+
+			case 5:		// "resize":
+				if (!e.length && !obstructed(true))
+					return;			// app doesn't support obstruct notification (not a watchface)
 				break;
+
+			default:
+				// always invoke time callback immediately
+				Timer.set(() => {
+					callback({date: new Date});
+				});
+
+				this.#schedule();
+				break;
+
 		}
+
+		e.push(callback)
 	}
 	#schedule() {
 		const seconds = this.#events.has("secondchange"), minutes = this.#events.has("minutechange"),

build/devices/pebble/modules/global/pebble-global.c

@@ -23,6 +23,7 @@
 #include "mc.xs.h"      // for xsID_ values
 #include "moddableAppState.h"
 #include "services/common/clock.h"
+#include "applib/app_watch_info.h"
 #include "applib/connection_service.h"
 #include "process_state/app_state/app_state.h"
 
@@ -82,8 +83,12 @@ static const UnobstructedAreaHandlers gUnobstructedHandlers = {
 
 void xs_global_obstructed(xsMachine *the)
 {
-	if (xsmcTest(xsArg(0)))
-		app_unobstructed_area_service_subscribe(gUnobstructedHandlers, the);
+	if (xsmcTest(xsArg(0))) {
+		if (app_manager_is_watchface_running()) {
+			app_unobstructed_area_service_subscribe(gUnobstructedHandlers, the);
+			xsmcSetTrue(xsResult);
+		}
+	}
 	else
 		app_unobstructed_area_service_unsubscribe();
 }