MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-06-22 21:10:21 +02:00
Code Releases Wiki Activity

Merge branch 'upstream_master' into black_whitelist_for_notifications

Browse Source
This commit is contained in:
AndrewBedscastle 2018-12-06 12:54:14 +01:00
commit c5358bcbdf
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/no1f1/No1F1Coordinator.java
View File

@ -59,7 +59,7 @@ public class No1F1Coordinator extends AbstractDeviceCoordinator {
@Override
public DeviceType getSupportedType(GBDeviceCandidate candidate) {
String name = candidate.getDevice().getName();
if (name != null && name.startsWith("X-RUN")) {
if (name != null && (name.startsWith("X-RUN") || name.startsWith("MH30"))) {
return DeviceType.NO1F1;
}

1
app/src/main/res/values-de/strings.xml
View File

@ -608,4 +608,5 @@
<string name="ok">Akzeptieren</string>
<string name="mi3_night_mode_sunset">Bei Sonnenuntergang</string>
<string name="pref_rtl_max_line_length">Maximale Zeilenlänge von rechts nach links</string>
</resources>

1
app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationServiceTestCase.java
View File

@ -120,6 +120,7 @@ public class DeviceCommunicationServiceTestCase extends TestBase {
public void testRtlSupport() {
SharedPreferences settings = GBApplication.getPrefs().getPreferences();
SharedPreferences.Editor editor = settings.edit();
editor.putBoolean("transliteration", false);
editor.putBoolean(GBPrefs.RTL_SUPPORT, true);
editor.commit();