mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge.git
synced 2026-07-31 07:44:24 +02:00
Zepp OS: Improve gpx upload support auto-detection
This commit is contained in:
+1
-1
@@ -50,7 +50,7 @@ public class AmazfitActiveCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
-5
@@ -55,11 +55,6 @@ public class AmazfitActive2Coordinator extends ZeppOsCoordinator {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsControlCenter() {
|
||||
return true;
|
||||
|
||||
+1
-1
@@ -55,7 +55,7 @@ public class AmazfitActiveEdgeCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ public class AmazfitBalanceCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ public class AmazfitBip5Coordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -55,7 +55,7 @@ public class AmazfitCheetahProCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ public class AmazfitCheetahRoundCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ public class AmazfitCheetahSquareCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -58,7 +58,7 @@ public class AmazfitGTR4Coordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ public class AmazfitGTRMiniCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ public class AmazfitGTS4Coordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ public class AmazfitTRex3Coordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ public class AmazfitTRexUltraCoordinator extends ZeppOsCoordinator {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean supportsGpxUploads() {
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+5
-7
@@ -112,11 +112,9 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
|
||||
}
|
||||
}
|
||||
|
||||
if (supportsGpxUploads()) {
|
||||
final ZeppOsGpxRouteInstallHandler gpxRouteInstallHandler = new ZeppOsGpxRouteInstallHandler(uri, context);
|
||||
if (gpxRouteInstallHandler.isValid()) {
|
||||
return gpxRouteInstallHandler;
|
||||
}
|
||||
final ZeppOsGpxRouteInstallHandler gpxRouteInstallHandler = new ZeppOsGpxRouteInstallHandler(uri, context);
|
||||
if (gpxRouteInstallHandler.isValid()) {
|
||||
return gpxRouteInstallHandler;
|
||||
}
|
||||
|
||||
final ZeppOsMapsInstallHandler mapsInstallHandler = new ZeppOsMapsInstallHandler(uri, context);
|
||||
@@ -562,8 +560,8 @@ public abstract class ZeppOsCoordinator extends HuamiCoordinator {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean supportsGpxUploads() {
|
||||
return false;
|
||||
public boolean supportsGpxUploads(final GBDevice device) {
|
||||
return supportsBleFileTransfer(device, "sport");
|
||||
}
|
||||
|
||||
public boolean supportsControlCenter() {
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@ public class ZeppOsGpxRouteInstallHandler implements InstallHandler {
|
||||
return;
|
||||
}
|
||||
final ZeppOsCoordinator zeppOsCoordinator = (ZeppOsCoordinator) coordinator;
|
||||
if (!zeppOsCoordinator.supportsGpxUploads()) {
|
||||
if (!zeppOsCoordinator.supportsGpxUploads(device)) {
|
||||
installActivity.setInfoText(mContext.getString(R.string.fwapp_install_device_not_supported));
|
||||
installActivity.setInstallEnabled(false);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user