From f161d129f557241602b2b904957b977c9146c1b7 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 30 Mar 2026 14:00:34 +0200 Subject: [PATCH] Fossil Q: Fix spelling in code and logging --- app/src/main/AndroidManifest.xml | 2 +- ...ty.java => QHybridAppChooserActivity.java} | 12 +++++------ .../qhybrid/QHybridConfigActivity.java | 2 +- .../adapter/fossil/FossilWatchAdapter.java | 20 +++++++++---------- ...r.xml => activity_qhybrid_app_chooser.xml} | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) rename app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/{QHybridAppChoserActivity.java => QHybridAppChooserActivity.java} (95%) rename app/src/main/res/layout/{activity_qhybrid_app_choser.xml => activity_qhybrid_app_chooser.xml} (93%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 381d27479d..0eef8a601b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -973,7 +973,7 @@ android:exported="true" android:parentActivityName=".activities.devicesettings.DeviceSettingsActivity" /> diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChoserActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChooserActivity.java similarity index 95% rename from app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChoserActivity.java rename to app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChooserActivity.java index 734a1efb5f..9ba9981908 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChoserActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridAppChooserActivity.java @@ -16,6 +16,8 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.devices.qhybrid; +import static android.view.View.GONE; + import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; @@ -48,9 +50,7 @@ import nodomain.freeyourgadget.gadgetbridge.activities.AbstractGBActivity; import nodomain.freeyourgadget.gadgetbridge.service.devices.qhybrid.QHybridSupport; import nodomain.freeyourgadget.gadgetbridge.util.GB; -import static android.view.View.GONE; - -public class QHybridAppChoserActivity extends AbstractGBActivity { +public class QHybridAppChooserActivity extends AbstractGBActivity { private static final AtomicLong THREAD_COUNTER = new AtomicLong(0L); boolean hasControl = false; @@ -60,7 +60,7 @@ public class QHybridAppChoserActivity extends AbstractGBActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_qhybrid_app_choser); + setContentView(R.layout.activity_qhybrid_app_chooser); helper = new PackageConfigHelper(getApplicationContext()); @@ -89,7 +89,7 @@ public class QHybridAppChoserActivity extends AbstractGBActivity { runOnUiThread(new Runnable() { @Override public void run() { - appList.setAdapter(new ConfigArrayAdapter(QHybridAppChoserActivity.this, R.layout.qhybrid_app_view, packages, manager)); + appList.setAdapter(new ConfigArrayAdapter(QHybridAppChooserActivity.this, R.layout.qhybrid_app_view, packages, manager)); findViewById(R.id.qhybrid_packageChooserLoading).setVisibility(GONE); } }); @@ -140,7 +140,7 @@ public class QHybridAppChoserActivity extends AbstractGBActivity { if(success){ try { helper.saveNotificationConfiguration(config); - LocalBroadcastManager.getInstance(QHybridAppChoserActivity.this).sendBroadcast(new Intent(QHybridSupport.QHYBRID_COMMAND_NOTIFICATION_CONFIG_CHANGED)); + LocalBroadcastManager.getInstance(QHybridAppChooserActivity.this).sendBroadcast(new Intent(QHybridSupport.QHYBRID_COMMAND_NOTIFICATION_CONFIG_CHANGED)); } catch (Exception e) { GB.toast("error saving configuration", Toast.LENGTH_SHORT, GB.ERROR, e); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConfigActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConfigActivity.java index 1121c9dcb3..661cda53ab 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConfigActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConfigActivity.java @@ -376,7 +376,7 @@ public class QHybridConfigActivity extends AbstractGBActivity { addButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - startActivityForResult(new Intent(QHybridConfigActivity.this, QHybridAppChoserActivity.class), REQUEST_CODE_ADD_APP); + startActivityForResult(new Intent(QHybridConfigActivity.this, QHybridAppChooserActivity.class), REQUEST_CODE_ADD_APP); } }); return addButton; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java index 4ce3831577..9273bcb5a5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil/FossilWatchAdapter.java @@ -889,10 +889,10 @@ public class FossilWatchAdapter extends WatchAdapter { queueNextRequest(); } - public void queueWrite(RequestMtuRequest request, boolean priorise) { + public void queueWrite(RequestMtuRequest request, boolean prioritise) { log("is connected: " + getDeviceSupport().isConnected()); if (!getDeviceSupport().isConnected()) { - log("dropping requetst " + request.getName()); + log("dropping request " + request.getName()); return; } getDeviceSupport().createTransactionBuilder("requestMtu") @@ -906,10 +906,10 @@ public class FossilWatchAdapter extends WatchAdapter { LOG.debug(message); } - public void queueWrite(SetDeviceStateRequest request, boolean priorise) { + public void queueWrite(SetDeviceStateRequest request, boolean prioritise) { if (fossilRequest != null && !fossilRequest.isFinished()) { log("queing request: " + request.getName()); - if (priorise) { + if (prioritise) { requestQueue.add(0, request); } else { requestQueue.add(request); @@ -925,15 +925,15 @@ public class FossilWatchAdapter extends WatchAdapter { getDeviceSupport().getDevice().setUpdateState(state, getContext()); } - public void queueWrite(FossilRequest request, boolean priorise) { + public void queueWrite(FossilRequest request, boolean prioritise) { log("is connected: " + getDeviceSupport().isConnected()); if (!getDeviceSupport().isConnected()) { - log("dropping requetst " + request.getName()); + log("dropping request " + request.getName()); return; } if (fossilRequest != null && !fossilRequest.isFinished()) { log("queing request: " + request.getName()); - if (priorise) { + if (prioritise) { requestQueue.add(0, request); } else { requestQueue.add(request); @@ -952,10 +952,10 @@ public class FossilWatchAdapter extends WatchAdapter { } } - public void queueWrite(Request request, boolean priorise) { + public void queueWrite(Request request, boolean prioritise) { log("is connected: " + getDeviceSupport().isConnected()); if (!getDeviceSupport().isConnected()) { - log("dropping requetst " + request.getName()); + log("dropping request " + request.getName()); return; } restartRequestTimeout(); @@ -967,7 +967,7 @@ public class FossilWatchAdapter extends WatchAdapter { protected void queueWrite(Request request) { log("is connected: " + getDeviceSupport().isConnected()); if (!getDeviceSupport().isConnected()) { - log("dropping requetst " + request.getName()); + log("dropping request " + request.getName()); return; } if (request instanceof SetDeviceStateRequest) diff --git a/app/src/main/res/layout/activity_qhybrid_app_choser.xml b/app/src/main/res/layout/activity_qhybrid_app_chooser.xml similarity index 93% rename from app/src/main/res/layout/activity_qhybrid_app_choser.xml rename to app/src/main/res/layout/activity_qhybrid_app_chooser.xml index d9c02ff6ea..cd872b1cc8 100644 --- a/app/src/main/res/layout/activity_qhybrid_app_choser.xml +++ b/app/src/main/res/layout/activity_qhybrid_app_chooser.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".devices.qhybrid.QHybridAppChoserActivity"> + tools:context=".devices.qhybrid.QHybridAppChooserActivity">