battery optimization; remove aod permission

alicescfernandes · Jan 19, 2021 · 3e6ac36 · 3e6ac36
1 parent 36db9f0
commit 3e6ac36
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 11 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/index.js b/app/index.js
@@ -55,26 +55,27 @@ function renderFace() {
 
 		hrm.start();
 	} else {
-		weather_element.style.display = 'none';
-		heart_rate_element.style.display = 'none';
+		if (display.aodActive) {
+			weather_element.style.display = 'none';
+			heart_rate_element.style.display = 'none';
 
-		battery_level_element.x = 90;
-		battery_level_element.y = 32;
+			battery_level_element.x = 90;
+			battery_level_element.y = 32;
+
+			messaging.peerSocket.removeEventListener('open', startCompanionConnection);
+			messaging.peerSocket.removeEventListener('message', parseWeatherData);
+			closeCompanionConnection();
+		}
 
-		messaging.peerSocket.removeEventListener('open', startCompanionConnection);
-		messaging.peerSocket.removeEventListener('message', parseWeatherData);
-		closeCompanionConnection();
 		hrm.stop();
 	}
 }
 
 if (display.aodAvailable && me.permissions.granted('access_aod')) {
 	display.aodAllowed = true;
-	renderFace();
-	display.addEventListener('change', renderFace);
 }
-
-//Events
+renderFace();
+display.addEventListener('change', renderFace);
 
 //Change heart rate sensor
 hrm.addEventListener('reading', () => {

diff --git a/package.json b/package.json
@@ -6,6 +6,12 @@
 		"iconFile": "resources/icon.png",
 		"wipeColor": "",
 		"requestedPermissions": [
+			"access_internet",
+			"run_background",
+			"access_heart_rate",
+			"access_location"
+		],
+		"requestedPermissions2": [
 			"access_internet",
 			"run_background",
 			"access_heart_rate",

diff --git a/resources/images/13d.ol.png b/resources/images/13d.ol.png
diff --git a/resources/images/13d.png b/resources/images/13d.png
diff --git a/resources/images/13n.ol.png b/resources/images/13n.ol.png
diff --git a/resources/images/13n.png b/resources/images/13n.png
diff --git a/resources/images/50d.png b/resources/images/50d.png
diff --git a/resources/images/50n.png b/resources/images/50n.png