diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 69c08864b..e792e65b9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -186,10 +186,6 @@ android:name=".devices.garmin.GarminRealtimeSettingsActivity" android:label="@string/loading" android:parentActivityName=".activities.devicesettings.DeviceSettingsActivity" /> - { - Intent enableIntent = new Intent(requireContext(), PebbleSettingsActivity.class); - startActivity(enableIntent); - return true; - }); - } - pref = findPreference("datetime_synconconnect"); if (pref != null) { pref.setOnPreferenceChangeListener((preference, newVal) -> { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleSettingsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleSettingsActivity.java deleted file mode 100644 index cd3ac9ecc..000000000 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PebbleSettingsActivity.java +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright (C) 2023-2024 José Rebelo - - This file is part of Gadgetbridge. - - Gadgetbridge is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Gadgetbridge is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.devices.pebble; - -import android.content.Intent; -import android.os.Bundle; -import android.text.InputType; - -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceFragmentCompat; - -import nodomain.freeyourgadget.gadgetbridge.R; -import nodomain.freeyourgadget.gadgetbridge.activities.AbstractPreferenceFragment; -import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivityV2; -import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager; - -public class PebbleSettingsActivity extends AbstractSettingsActivityV2 { - @Override - protected String fragmentTag() { - return PebbleSettingsFragment.FRAGMENT_TAG; - } - - @Override - protected PreferenceFragmentCompat newFragment() { - return new PebbleSettingsFragment(); - } - - public static class PebbleSettingsFragment extends AbstractPreferenceFragment { - static final String FRAGMENT_TAG = "PEBBLE_SETTINGS_FRAGMENT"; - - @Override - public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) { - setPreferencesFromResource(R.xml.pebble_preferences, rootKey); - - setInputTypeFor("pebble_mtu_limit", InputType.TYPE_CLASS_NUMBER); - setInputTypeFor("pebble_emu_port", InputType.TYPE_CLASS_NUMBER); - - final Preference pebbleEmuAddrPref = findPreference("pebble_emu_addr"); - if (pebbleEmuAddrPref != null) { - pebbleEmuAddrPref.setOnPreferenceChangeListener((preference, newVal) -> { - Intent refreshIntent = new Intent(DeviceManager.ACTION_REFRESH_DEVICELIST); - LocalBroadcastManager.getInstance(requireContext().getApplicationContext()).sendBroadcast(refreshIntent); - return true; - }); - } - - final Preference pebbleEmuPort = findPreference("pebble_emu_port"); - if (pebbleEmuPort != null) { - pebbleEmuPort.setOnPreferenceChangeListener((preference, newVal) -> { - Intent refreshIntent = new Intent(DeviceManager.ACTION_REFRESH_DEVICELIST); - LocalBroadcastManager.getInstance(requireContext().getApplicationContext()).sendBroadcast(refreshIntent); - return true; - }); - } - } - } -} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java index 609f7560d..e70ca8d11 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java @@ -101,13 +101,6 @@ public class DeviceHelper { Set availableDevices = new LinkedHashSet<>(getDatabaseDevices()); Prefs prefs = GBApplication.getPrefs(); - - String pebbleEmuAddr = prefs.getString("pebble_emu_addr", ""); - String pebbleEmuPort = prefs.getString("pebble_emu_port", ""); - if (pebbleEmuAddr.length() >= 7 && !pebbleEmuPort.isEmpty()) { - GBDevice pebbleEmuDevice = new GBDevice(pebbleEmuAddr + ":" + pebbleEmuPort, "Pebble qemu", "", null, DeviceType.PEBBLE); - availableDevices.add(pebbleEmuDevice); - } return availableDevices; } diff --git a/app/src/main/res/xml/devicesettings_pebble_preferences.xml b/app/src/main/res/xml/devicesettings_pebble_preferences.xml index a06cef6e0..fa8c090e9 100644 --- a/app/src/main/res/xml/devicesettings_pebble_preferences.xml +++ b/app/src/main/res/xml/devicesettings_pebble_preferences.xml @@ -141,21 +141,5 @@ android:summary="@string/pref_summary_pebble_enable_bgjs" android:title="@string/pref_title_pebble_enable_bgjs" app:iconSpaceReserved="false" /> - diff --git a/app/src/main/res/xml/discovery_pairing_preferences.xml b/app/src/main/res/xml/discovery_pairing_preferences.xml index 12a00e932..b58fdbe9e 100644 --- a/app/src/main/res/xml/discovery_pairing_preferences.xml +++ b/app/src/main/res/xml/discovery_pairing_preferences.xml @@ -16,4 +16,15 @@ android:summary="@string/auto_reconnect_ble_scan_summary" android:layout="@layout/preference_checkbox" app:iconSpaceReserved="false" /> + + + diff --git a/app/src/main/res/xml/pebble_preferences.xml b/app/src/main/res/xml/pebble_preferences.xml deleted file mode 100644 index 9dd4c98d7..000000000 --- a/app/src/main/res/xml/pebble_preferences.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - -