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

Moved the unique ID out of networkpackage se we don't need to create one

Browse Source
This commit is contained in:
Albert Vaca
2015-09-10 09:01:12 -07:00
parent 78d80ef5eb
commit 473d984971
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
View File

@@ -40,6 +40,7 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.kde.kdeconnect.Backends.BaseLink; import org.kde.kdeconnect.Backends.BaseLink;
import org.kde.kdeconnect.Backends.BaseLinkProvider; import org.kde.kdeconnect.Backends.BaseLinkProvider;
import org.kde.kdeconnect.Device; import org.kde.kdeconnect.Device;
import org.kde.kdeconnect.Helpers.DeviceHelper;
import org.kde.kdeconnect.NetworkPackage; import org.kde.kdeconnect.NetworkPackage;
import org.kde.kdeconnect.UserInterface.CustomDevicesActivity; import org.kde.kdeconnect.UserInterface.CustomDevicesActivity;
@@ -127,8 +128,7 @@ public class LanLinkProvider extends BaseLinkProvider {
NetworkPackage np = NetworkPackage.unserialize(theMessage); NetworkPackage np = NetworkPackage.unserialize(theMessage);
if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) { if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
String myId = DeviceHelper.getDeviceId(context);
String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
if (np.getString("deviceId").equals(myId)) { if (np.getString("deviceId").equals(myId)) {
return; return;
} }
@@ -167,7 +167,7 @@ public class LanLinkProvider extends BaseLinkProvider {
Log.e("KDE/LanLinkProvider", "Expecting an identity package (B)"); Log.e("KDE/LanLinkProvider", "Expecting an identity package (B)");
return; return;
} else { } else {
String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId"); String myId = DeviceHelper.getDeviceId(context);
if (identityPackage.getString("deviceId").equals(myId)) { if (identityPackage.getString("deviceId").equals(myId)) {
return; return;
} }

4
src/org/kde/kdeconnect/Helpers/DeviceHelper.java
View File

@@ -26,6 +26,7 @@ import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.Settings;
import android.util.Log; import android.util.Log;
import java.util.HashMap; import java.util.HashMap;
@@ -488,4 +489,7 @@ public class DeviceHelper {
preferences.edit().putString(KEY_DEVICE_NAME_PREFERENCE, name).apply(); preferences.edit().putString(KEY_DEVICE_NAME_PREFERENCE, name).apply();
} }
public static String getDeviceId(Context context) {
return Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
}
} }

2
src/org/kde/kdeconnect/NetworkPackage.java
View File

@@ -247,7 +247,7 @@ public class NetworkPackage {
NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_IDENTITY); NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_IDENTITY);
String deviceId = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID); String deviceId = DeviceHelper.getDeviceId(context);
try { try {
np.mBody.put("deviceId", deviceId); np.mBody.put("deviceId", deviceId);
np.mBody.put("deviceName", DeviceHelper.getDeviceName(context)); np.mBody.put("deviceName", DeviceHelper.getDeviceName(context));