Small reconnection bug

Branding

KdeConnect/src/main/AndroidManifest.xml

@@ -9,14 +9,13 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="KdeConnect "
+        android:icon="@drawable/icon"
+        android:label="KDE Connect"
         android:theme="@style/AppTheme" >
 
-
         <activity
             android:name="org.kde.connect.MainActivity"
-            android:label="KdeConnect " >
+            android:label="KDE Connect" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -26,12 +25,12 @@
 
         <activity
             android:name="org.kde.connect.MprisActivity"
-            android:label="KdeConnect Mpris controls"
+            android:label="MPRIS controls"
         />
 
         <activity
                 android:name="org.kde.connect.SettingsActivity"
-                android:label="KdeConnect Settings"
+                android:label="KDE Connect Settings"
                 />
 
         <service
@@ -39,7 +38,6 @@
             android:name="org.kde.connect.BackgroundService">
         </service>
 
-
         <receiver android:name="org.kde.connect.ServiceLauncher">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED"></action>

KdeConnect/src/main/java/org/kde/connect/BackgroundService.java

@@ -221,12 +221,6 @@ public class BackgroundService extends Service {
 
     }
 
-    public void restart() {
-        devices.clear();
-        stopDiscovery();
-        startDiscovery();
-    }
-
     @Override
     public void onDestroy() {
         Log.i("BackgroundService", "Destroying");

KdeConnect/src/main/java/org/kde/connect/LinkProviders/AvahiTcpLinkProvider.java

@@ -67,7 +67,8 @@ public class AvahiTcpLinkProvider extends BaseLinkProvider {
 
                                 link.setDeviceId(id);
                                 link.sendPackage(NetworkPackage.createIdentityPackage(context));
-                                if (visibleComputers.containsKey(serviceInfo.toString())) {
+                                if (visibleComputers.containsKey(serviceInfo.getServiceName())) {
+                                    Log.e("AvahiTcpLinkProvider","Removing old connection to same device");
                                     //Remove old connection to same host, probably down
                                     connectionLost(visibleComputers.get(serviceInfo.getServiceName()));
                                 }
@@ -145,7 +146,6 @@ public class AvahiTcpLinkProvider extends BaseLinkProvider {
 
         if (oldListener != null) mNsdManager.stopServiceDiscovery(oldListener);
         oldListener = null;
-        visibleComputers.clear();
 
     }
 

KdeConnect/src/main/java/org/kde/connect/MainActivity.java

@@ -36,7 +36,8 @@ public class MainActivity extends Activity {
                 BackgroundService.RunCommand(MainActivity.this, new BackgroundService.InstanceCallback() {
                     @Override
                     public void onServiceStart(BackgroundService service) {
-                        service.restart();
+                        service.stopDiscovery();
+                        service.startDiscovery();
                     }
                 });
             }