Merge pull request #121 from DroidPlanner/fix_udp_connection

Fix double connection bug

Author: m4gr3d

ClientLib/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_ARTIFACT_ID = 'dronekit-android'
     PUBLISH_VERSION = '2.3.09'
-    PROJECT_DESCRIPTION = "DroneKit-Android Client Library"
+    PROJECT_DESCRIPTION = "Android DroneKit client library."
     PROJECT_LABELS = ['3DR', '3DR Services', 'DroneAPI', 'Android', 'DroneKit']
     PROJECT_LICENSES = ['Apache-2.0']
 }

ServiceApp/build.gradle

@@ -35,7 +35,7 @@ android {
         applicationId 'org.droidplanner.services.android'
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 10212
+        versionCode 10213
         versionName getGitVersion()
     }
 

ServiceApp/src/org/droidplanner/services/android/drone/DroneManager.java

@@ -132,15 +132,17 @@ public void connect(String appId, DroneEventsListener listener) throws Connectio
         if (!mavClient.isConnected()) {
             mavClient.openConnection();
         } else {
-            listener.onDroneEvent(DroneInterfaces.DroneEventsType.CONNECTED, drone);
-
-            if (drone.isConnectionAlive())
-                listener.onDroneEvent(DroneInterfaces.DroneEventsType.HEARTBEAT_FIRST, drone);
-            else
-                listener.onDroneEvent(DroneInterfaces.DroneEventsType.HEARTBEAT_TIMEOUT, drone);
+            if (drone.isConnected()) {
 
+                if (drone.isConnectionAlive())
+                    listener.onDroneEvent(DroneInterfaces.DroneEventsType.HEARTBEAT_FIRST, drone);
+                else {
+                    listener.onDroneEvent(DroneInterfaces.DroneEventsType.CONNECTED, drone);
+                    listener.onDroneEvent(DroneInterfaces.DroneEventsType.HEARTBEAT_TIMEOUT, drone);
+                }
 
-            notifyConnected(appId, listener);
+                notifyConnected(appId, listener);
+            }
         }
 
         mavClient.addLoggingFile(appId);

doc/getting_started.rst

@@ -46,7 +46,7 @@ For an existing app:
 	}
 
 	dependencies {
-	    compile 'com.o3dr:droneKit-android:2.3.+'
+	    compile 'com.o3dr.android:droneKit-android:2.3.+'
 	    ...
 	}
 

release_android_library.gradle

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
 def publishFlag = false
-def projectGroupId = 'com.o3dr'
+def projectGroupId = 'com.o3dr.android'
 def projectArtifactId = project.PUBLISH_ARTIFACT_ID
 def projectVersion = project.PUBLISH_VERSION
 def projectDescription = project.PROJECT_DESCRIPTION
@@ -79,9 +79,8 @@ bintray {
     pkg {
         repo = getMavenRepo()
         name = projectArtifactId
-        userOrg = '3d-robotics'
         desc = projectDescription
-        websiteUrl = 'https://github.com/DroidPlanner/DroneKit-Android'
+        websiteUrl = 'http://android.dronekit.io/'
         issueTrackerUrl = 'https://github.com/DroidPlanner/DroneKit-Android/issues'
         vcsUrl = 'https://github.com/DroidPlanner/DroneKit-Android.git'
         licenses = projectLicenses