Attempt to fix TinyWeatherForecastGermanyReceiver on some devices

This commit is contained in:
José Rebelo
2026-03-10 19:47:14 +00:00
parent 50338052b6
commit 3739a2935e
@@ -20,9 +20,13 @@ package nodomain.freeyourgadget.gadgetbridge.externalevents;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Toast; import android.widget.Toast;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -32,22 +36,49 @@ import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class TinyWeatherForecastGermanyReceiver extends BroadcastReceiver { public class TinyWeatherForecastGermanyReceiver extends BroadcastReceiver {
private static final Logger LOG = LoggerFactory.getLogger(TinyWeatherForecastGermanyReceiver.class);
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (intent != null) { if (intent == null) {
Bundle bundle = intent.getExtras(); LOG.warn("Got null intent");
if (bundle != null) { return;
}
final Bundle bundle = intent.getExtras();
if (bundle == null) {
LOG.warn("Got null bundle");
return;
}
LOG.debug("Got intent for {}", intent.getAction());
try {
bundle.setClassLoader(WeatherSpec.class.getClassLoader());
final WeatherSpec weatherSpec;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
weatherSpec = bundle.getParcelable("WeatherSpec", WeatherSpec.class);
} else {
weatherSpec = bundle.getParcelable("WeatherSpec");
}
if (weatherSpec == null) {
LOG.warn("Got null WeatherSpec");
return;
}
final ArrayList<WeatherSpec> weatherSpecs = new ArrayList<>(Collections.singletonList(weatherSpec));
weatherSpec.setTimestamp((int) (System.currentTimeMillis() / 1000));
Weather.setWeatherSpec(weatherSpecs);
GBApplication.deviceService().onSendWeather();
} catch (Exception e) {
GB.toast("Gadgetbridge received broken or incompatible weather data", Toast.LENGTH_SHORT, GB.ERROR, e);
for (String key : bundle.keySet()) {
try { try {
WeatherSpec weatherSpec = bundle.getParcelable("WeatherSpec"); LOG.debug("WeatherSpec {} -> {}", key, bundle.get(key));
if (weatherSpec != null) { } catch (final Exception e2) {
ArrayList<WeatherSpec> weatherSpecs = new ArrayList<>(Collections.singletonList(weatherSpec)); LOG.warn("Failed to log WeatherSpec key {}", key, e2);
weatherSpec.setTimestamp((int) (System.currentTimeMillis() / 1000));
Weather.setWeatherSpec(weatherSpecs);
GBApplication.deviceService().onSendWeather();
}
} catch (Exception e) {
GB.toast("Gadgetbridge received broken or incompatible weather data", Toast.LENGTH_SHORT, GB.ERROR, e);
} }
} }
} }