MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-01 14:32:54 +01:00
Code Releases Wiki Activity

Ensure that slf4j is not used before being initialized, fixes #2394

Browse Source
This commit is contained in:
vanous 2021-09-20 18:18:04 +02:00
parent 6b10453714
commit b8855f16ee
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GBPrefs.java
View File

@ -24,12 +24,10 @@ import android.location.Criteria;
import android.location.Location; import android.location.Location;
import android.location.LocationManager; import android.location.LocationManager;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.util.Log;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.ParseException; import java.text.ParseException;
import java.util.Date; import java.util.Date;
@ -37,7 +35,8 @@ import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst; import nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst;
public class GBPrefs { public class GBPrefs {
private static final Logger LOG = LoggerFactory.getLogger(GBPrefs.class); // Since this class must not log to slf4j, we use plain android.util.Log
private static final String TAG = "GBPrefs";
public static final String PACKAGE_BLACKLIST = "package_blacklist"; public static final String PACKAGE_BLACKLIST = "package_blacklist";
public static final String PACKAGE_PEBBLEMSG_BLACKLIST = "package_pebblemsg_blacklist"; public static final String PACKAGE_PEBBLEMSG_BLACKLIST = "package_pebblemsg_blacklist";
@ -118,7 +117,7 @@ public class GBPrefs {
float latitude = prefs.getFloat("location_latitude", 0); float latitude = prefs.getFloat("location_latitude", 0);
float longitude = prefs.getFloat("location_longitude", 0); float longitude = prefs.getFloat("location_longitude", 0);
LOG.info("got longitude/latitude from preferences: " + latitude + "/" + longitude); Log.i(TAG, "got longitude/latitude from preferences: " + latitude + "/" + longitude);
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED && if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
prefs.getBoolean("use_updated_location_if_available", false)) { prefs.getBoolean("use_updated_location_if_available", false)) {
@ -130,7 +129,7 @@ public class GBPrefs {
if (lastKnownLocation != null) { if (lastKnownLocation != null) {
latitude = (float) lastKnownLocation.getLatitude(); latitude = (float) lastKnownLocation.getLatitude();
longitude = (float) lastKnownLocation.getLongitude(); longitude = (float) lastKnownLocation.getLongitude();
LOG.info("got longitude/latitude from last known location: " + latitude + "/" + longitude); Log.i(TAG, "got longitude/latitude from last known location: " + latitude + "/" + longitude);
} }
} }
} }