demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Resolve issues from review

Browse Source
This commit is contained in:
Arjan Schrijver
2025-12-25 14:45:08 +01:00
committed by Arjan Schrijver
parent 775d064262
commit 77f0dbbad8
7 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/InternetHelperPreferencesActivity.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import nodomain.freeyourgadget.gadgetbridge.util.PermissionsUtils.PACKAGE_INTERN
class InternetHelperPreferencesActivity : AbstractGBActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_internet_helper_preferences)
setContentView(R.layout.activity_settings)
supportFragmentManager
.beginTransaction()
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/deviceevents/GBDeviceEventAppMessage.java
-2
View File
@@ -33,7 +33,6 @@ public class GBDeviceEventAppMessage extends GBDeviceEvent {
public UUID appUUID;
public int id;
public String message;
public GBDevice device;
@NonNull
@Override
@@ -43,7 +42,6 @@ public class GBDeviceEventAppMessage extends GBDeviceEvent {
", appUUID=" + appUUID +
", message='" + message + '\'' +
", id=" + id +
", device=" + device +
'}';
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
+5 -5
View File
@@ -105,20 +105,20 @@ class PebbleIoThread extends GBDeviceIoThread {
private int mBytesWritten = -1;
private void sendAppMessageJS(GBDeviceEventAppMessage appMessage) {
sendAppMessage(appMessage);
sendAppMessage(gbDevice, appMessage);
if (appMessage.type == GBDeviceEventAppMessage.TYPE_APPMESSAGE) {
write(mPebbleProtocol.encodeApplicationMessageAck(appMessage.appUUID, (byte) appMessage.id));
}
}
private static void sendAppMessage(GBDeviceEventAppMessage message) {
if (! ((PebbleCoordinator) message.device.getDeviceCoordinator()).isBackgroundJsEnabled(message.device)) {
private static void sendAppMessage(GBDevice device, GBDeviceEventAppMessage message) {
if (! ((PebbleCoordinator) device.getDeviceCoordinator()).isBackgroundJsEnabled(device)) {
LOG.info("App message received but Pebble JS Service not running");
return;
}
final String jsEvent;
try {
PebbleJsService.Companion.getInstance().checkAppRunning(message.device, message.appUUID);
PebbleJsService.Companion.getInstance().checkAppRunning(device, message.appUUID);
} catch (NullPointerException | IllegalStateException ex) {
LOG.warn("Unable to send app message: {}", message, ex);
return;
@@ -134,7 +134,7 @@ class PebbleIoThread extends GBDeviceIoThread {
final String appMessage = PebbleUtils.parseIncomingAppMessage(message.message, message.appUUID, message.id);
LOG.debug("to WEBVIEW: event: {} message: {}", jsEvent, appMessage);
PebbleJsService.Companion.getInstance().evaluateJsForDevice(message.device, "if (typeof Pebble == 'object') Pebble.evaluate('" + jsEvent + "',[" + appMessage + "]);", s -> {
PebbleJsService.Companion.getInstance().evaluateJsForDevice(device, "if (typeof Pebble == 'object') Pebble.evaluate('" + jsEvent + "',[" + appMessage + "]);", s -> {
//TODO: the message should be acked here instead of in PebbleIoThread
LOG.debug("Callback from appmessage: {}", s);
});
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
-2
View File
@@ -1782,7 +1782,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
appMessage.appUUID = uuid;
appMessage.id = last_id & 0xff;
appMessage.message = jsonArray.toString();
appMessage.device = getDevice();
return new GBDeviceEvent[]{appMessage, sendBytesAck};
}
@@ -2563,7 +2562,6 @@ public class PebbleProtocol extends GBDeviceProtocol {
}
evtAppMessage.id = idLookup[last_id & 0xff];
evtAppMessage.appUUID = currentRunningApp;
evtAppMessage.device = getDevice();
}
devEvts = new GBDeviceEvent[]{evtAppMessage};
break;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/FileUtils.java
-3
View File
@@ -43,12 +43,9 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.nio.channels.FileChannel;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java
+4 -2
View File
@@ -208,10 +208,12 @@ public class PebbleUtils {
// Delay start until service is ready
new Handler(Looper.getMainLooper()).postDelayed(() -> {
PebbleJsService s = PebbleJsService.Companion.getInstance();
if (s != null) {
if (s == null) {
LOG.warn("Couldn't start PebbleJsService");
} else {
s.startJsForDevice(device, uuid);
}
}, 600);
}, 1000);
return;
}
app/src/main/res/layout/activity_internet_helper_preferences.xml
-19
View File
@@ -1,19 +0,0 @@
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root_scroll"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout
android:id="@+id/root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/settings_container"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>