InstallHandler: add @Nullable / @NonNull annotations

This commit is contained in:
Thomas Kuehne
2026-06-01 03:44:07 +00:00
parent 438576b610
commit 737a25b2ea
21 changed files with 44 additions and 43 deletions
@@ -74,7 +74,7 @@ public abstract class GpxRouteInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -112,7 +112,7 @@ public abstract class GpxRouteInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
}
@Nullable
@@ -1,4 +1,4 @@
/* Copyright (C) 2015-2024 Andreas Shimokawa, Carsten Pfeiffer
/* Copyright (C) 2015-2026 Andreas Shimokawa, Carsten Pfeiffer, Thomas Kuehne
This file is part of Gadgetbridge.
@@ -48,10 +48,10 @@ public interface InstallHandler {
* @param installActivity the activity to interact with
* @param device the device to which the element shall be installed
*/
void validateInstallation(InstallActivity installActivity, GBDevice device);
void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device);
/**
* Allows device specific code to be executed just before the installation starts
*/
void onStartInstall(GBDevice device);
void onStartInstall(@NonNull GBDevice device);
}
@@ -49,12 +49,12 @@ public class ATCBLEOEPLInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
installActivity.setInstallEnabled(true);
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
}
}
@@ -66,12 +66,12 @@ public class PixooInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
installActivity.setInstallEnabled(true);
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
}
}
@@ -128,7 +128,7 @@ public class GarminFitFileInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (fitParseException != null) {
installActivity.setInfoText(fitParseException.getLocalizedMessage());
installActivity.setInstallEnabled(false);
@@ -170,7 +170,7 @@ public class GarminFitFileInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
}
public byte[] getRawBytes() {
@@ -58,7 +58,7 @@ public class GarminPrgFileInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -115,7 +115,7 @@ public class GarminPrgFileInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
}
public byte[] getRawBytes() {
@@ -19,6 +19,8 @@ package nodomain.freeyourgadget.gadgetbridge.devices.huami.miband2;
import android.content.Context;
import android.net.Uri;
import androidx.annotation.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,7 +44,7 @@ public class MiBand2FWInstallHandler extends AbstractMiBandFWInstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
super.validateInstallation(installActivity, device);
maybeAddFw53Hint(installActivity, device);
maybeAddFontHint(installActivity);
@@ -87,7 +87,7 @@ public class ZeppOsAgpsInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -134,7 +134,7 @@ public class ZeppOsAgpsInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
}
public ZeppOsAgpsFile getFile() {
@@ -58,7 +58,7 @@ public class ZeppOsMapsInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -101,7 +101,7 @@ public class ZeppOsMapsInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
}
public ZeppOsMapsFile getFile() {
@@ -69,7 +69,7 @@ public class ZeppOsMusicInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -104,7 +104,7 @@ public class ZeppOsMusicInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
}
public AudioInfo getAudioInfo() {
@@ -110,7 +110,7 @@ public class HuaweiInstallHandler implements InstallHandler {
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
final HuaweiState huaweiDeviceState = HuaweiDeviceStateManager.get(device);
if (helper.isFirmware) {
@@ -304,7 +304,7 @@ public class HuaweiInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
helper.unsetFwBytes();
}
}
@@ -97,7 +97,7 @@ public class IGPSportRouteInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -138,7 +138,7 @@ public class IGPSportRouteInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
}
@@ -80,7 +80,7 @@ public abstract class AbstractMiBandFWInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -147,7 +147,7 @@ public abstract class AbstractMiBandFWInstallHandler implements InstallHandler {
protected abstract boolean isSupportedDeviceType(GBDevice device);
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
}
@@ -46,7 +46,6 @@ import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceApp;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.model.GenericItem;
import nodomain.freeyourgadget.gadgetbridge.util.FileUtils;
import nodomain.freeyourgadget.gadgetbridge.devices.pebble.PebbleHardware;
import nodomain.freeyourgadget.gadgetbridge.util.PebbleUtils;
import nodomain.freeyourgadget.gadgetbridge.deviceevents.GBDeviceEventVersionInfo;
@@ -63,7 +62,7 @@ public class PBWInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -162,7 +161,7 @@ public class PBWInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
if (mPBWReader.isFirmware() || mPBWReader.isLanguage()) {
return;
}
@@ -92,7 +92,7 @@ public class PineTimeInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
installActivity.setInstallEnabled(true);
if (device.isBusy()) {
@@ -131,7 +131,7 @@ public class PineTimeInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
}
@NonNull
@@ -68,7 +68,7 @@ public class FossilHRInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -106,7 +106,7 @@ public class FossilHRInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
DeviceCoordinator mCoordinator = device.getDeviceCoordinator();
LocalBroadcastManager manager = LocalBroadcastManager.getInstance(mContext);
manager.sendBroadcast(new Intent(GB.ACTION_SET_PROGRESS_BAR).putExtra(GB.PROGRESS_BAR_INDETERMINATE, true));
@@ -82,7 +82,7 @@ public class FossilInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -105,7 +105,7 @@ public class FossilInstallHandler implements InstallHandler {
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
}
@NonNull
@@ -56,13 +56,13 @@ public class ImageFilePrinterHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
installActivity.setPreview(incomingBitmap);
installActivity.setInstallEnabled(true);
}
@Override
public void onStartInstall(GBDevice device) {
public void onStartInstall(@NonNull GBDevice device) {
}
}
@@ -53,7 +53,7 @@ public class XiaomiInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -100,7 +100,7 @@ public class XiaomiInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
helper.unsetFwBytes(); // free up memory
}
}
@@ -52,7 +52,7 @@ public class CmfInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(final InstallActivity installActivity, final GBDevice device) {
public void validateInstallation(@NonNull final InstallActivity installActivity, @NonNull final GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -94,7 +94,7 @@ public class CmfInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
helper.unsetFwBytes(); // free up memory
}
}
@@ -75,7 +75,7 @@ public class ZeppOsFwInstallHandler implements InstallHandler {
}
@Override
public void validateInstallation(InstallActivity installActivity, GBDevice device) {
public void validateInstallation(@NonNull InstallActivity installActivity, @NonNull GBDevice device) {
if (device.isBusy()) {
installActivity.setInfoText(device.getBusyTask());
installActivity.setInstallEnabled(false);
@@ -132,7 +132,7 @@ public class ZeppOsFwInstallHandler implements InstallHandler {
}
@Override
public void onStartInstall(final GBDevice device) {
public void onStartInstall(@NonNull final GBDevice device) {
final boolean shouldCache = mHelper.getFirmwareType().isApp() || mHelper.getFirmwareType().isWatchface();
if (shouldCache) {
saveToCache(device);