mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-01 06:35:09 +00:00
Code Issues Releases Wiki Activity

Device type should be "desktop", no "computer"

Browse Source
This commit is contained in:
Albert Vaca
2015-09-09 01:07:17 -07:00
parent 57bc4d46a9
commit edb0ae3198
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/kde/kdeconnect/Device.java
View File

@@ -77,13 +77,13 @@ public class Device implements BaseLink.PackageReceiver {
public static DeviceType FromString(String s) { public static DeviceType FromString(String s) {
if ("tablet".equals(s)) return Tablet; if ("tablet".equals(s)) return Tablet;
if ("computer".equals(s)) return Computer; if ("desktop".equals(s)) return Computer;
return Phone; //Default return Phone; //Default
} }
public String toString() { public String toString() {
switch (this) { switch (this) {
case Tablet: return "tablet"; case Tablet: return "tablet";
case Computer: return "computer"; case Computer: return "desktop";
default: return "phone"; default: return "phone";
} }
} }
@@ -118,7 +118,7 @@ public class Device implements BaseLink.PackageReceiver {
this.name = settings.getString("deviceName", context.getString(R.string.unknown_device)); this.name = settings.getString("deviceName", context.getString(R.string.unknown_device));
this.pairStatus = PairStatus.Paired; this.pairStatus = PairStatus.Paired;
this.protocolVersion = NetworkPackage.ProtocolVersion; //We don't know it yet this.protocolVersion = NetworkPackage.ProtocolVersion; //We don't know it yet
this.deviceType = DeviceType.FromString(settings.getString("deviceType", "computer")); this.deviceType = DeviceType.FromString(settings.getString("deviceType", "desktop"));
try { try {
byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0); byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
@@ -139,10 +139,10 @@ public class Device implements BaseLink.PackageReceiver {
this.context = context; this.context = context;
this.deviceId = np.getString("deviceId"); this.deviceId = np.getString("deviceId");
this.name = np.getString("deviceName", context.getString(R.string.unknown_device)); this.name = context.getString(R.string.unknown_device); //We read it in addLink
this.pairStatus = PairStatus.NotPaired; this.pairStatus = PairStatus.NotPaired;
this.protocolVersion = np.getInt("protocolVersion"); this.protocolVersion = 0;
this.deviceType = DeviceType.FromString(np.getString("deviceType", "computer")); this.deviceType = DeviceType.Computer;
this.publicKey = null; this.publicKey = null;
settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE); settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
@@ -381,7 +381,7 @@ public class Device implements BaseLink.PackageReceiver {
} }
if (identityPackage.has("deviceType")) { if (identityPackage.has("deviceType")) {
this.deviceType = DeviceType.FromString(identityPackage.getString("deviceType", "computer")); this.deviceType = DeviceType.FromString(identityPackage.getString("deviceType", "desktop"));
} }