From 276eaa22f54ebfe0c75d413808d1c7ca1388958b Mon Sep 17 00:00:00 2001
From: Flaparoo <629229+flaparoo@users.noreply.github.com>
Date: Thu, 24 Apr 2025 13:23:36 +0800
Subject: [PATCH 1/2] android: pass HTTP request timeout to Gadgetbridge

---
 apps/android/lib.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/android/lib.js b/apps/android/lib.js
index 7ab7d4c25..fa64b1f1c 100644
--- a/apps/android/lib.js
+++ b/apps/android/lib.js
@@ -321,6 +321,7 @@ exports.httpHandler = (url,options) => {
   if (options.method) req.method = options.method;
   if (options.body) req.body = options.body;
   if (options.headers) req.headers = options.headers;
+  req.timeout = options.timeout || 30000;
   exports.gbSend(req);
   //create the promise
   var promise = new Promise(function(resolve,reject) {
@@ -329,7 +330,7 @@ exports.httpHandler = (url,options) => {
       //if after "timeoutMillisec" it still hasn't answered -> reject
       delete Bangle.httpRequest[options.id];
       reject("Timeout");
-    },options.timeout||30000)};
+    },req.timeout)};
   });
   return promise;
 };

From 3edf10fe0bdbe9c4349c6bcd04595d2ce4ccd02b Mon Sep 17 00:00:00 2001
From: Flaparoo <629229+flaparoo@users.noreply.github.com>
Date: Thu, 24 Apr 2025 21:48:52 +0800
Subject: [PATCH 2/2] android: pass HTTP request timeout to Gadgetbridge

---
 apps/android/ChangeLog     | 1 +
 apps/android/lib.js        | 2 +-
 apps/android/metadata.json | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/android/ChangeLog b/apps/android/ChangeLog
index 7df2e162d..84d917a8c 100644
--- a/apps/android/ChangeLog
+++ b/apps/android/ChangeLog
@@ -46,3 +46,4 @@
       arrival. (Needs Gadgetbridge nightly (either flavour) for now, or stable
       version 85 when it's out)
 0.43: Ensure listRecs doesn't list old-style recorded tracks (Otherwise Gadgetbridge fails parsing the filename)
+0.44: Pass HTTP request timeout to Gadgetbridge
diff --git a/apps/android/lib.js b/apps/android/lib.js
index fa64b1f1c..157c00544 100644
--- a/apps/android/lib.js
+++ b/apps/android/lib.js
@@ -330,7 +330,7 @@ exports.httpHandler = (url,options) => {
       //if after "timeoutMillisec" it still hasn't answered -> reject
       delete Bangle.httpRequest[options.id];
       reject("Timeout");
-    },req.timeout)};
+    },req.timeout+500)};
   });
   return promise;
 };
diff --git a/apps/android/metadata.json b/apps/android/metadata.json
index 7907e129d..c92678e23 100644
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.43",
+  "version": "0.44",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",