Merge branch 'master' into ubilabs--rcapp--develop

mobile/com.sap.sailing.android.shared/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    buildToolsVersion "22.0.1"
-    compileSdkVersion 22
+    buildToolsVersion rootProject.ext.buildTools
+    compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 22
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
     }
 
     sourceSets {
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     /* support libraries */
-    compile 'com.android.support:appcompat-v7:22.1.1'
+    compile "com.android.support:appcompat-v7:${rootProject.ext.support}"
 
     /* local dependencies */
     compile project(':java:com.sap.sailing.domain.common')
@@ -49,7 +49,7 @@ dependencies {
     compile project(':java:org.json.simple')
 
     /* Google Play Services */
-    compile "com.google.android.gms:play-services-location:7.3.0"
+    compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* all local jar-libs */
     compile fileTree(dir: "libs", include: ["*.jar"])

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSendingService.java

@@ -286,7 +286,7 @@ public class MessageSendingService extends Service implements MessageSendingList
         int resendMillis = PrefUtils.getInt(this, R.string.preference_messageResendIntervalMillis_key,
                 R.integer.preference_messageResendIntervalMillis_default);
         if (!success) {
-            ExLog.i(this, "MS", "success");
+            ExLog.i(this, "MS", "!success");
             reportApiConnectivity(APIConnectivity.transmissionError);
             ExLog.w(this, TAG, "Error while posting intent to server. Will persist intent...");
             try {
@@ -302,7 +302,7 @@ public class MessageSendingService extends Service implements MessageSendingList
             reportUnsentGPSFixesCount();
             serviceLogger.onMessageSentFailed();
         } else {
-            ExLog.i(this, "MS", "!success");
+            ExLog.i(this, "MS", "success");
             reportApiConnectivity(APIConnectivity.transmissionSuccess);
             ExLog.i(this, TAG, "Message successfully sent.");
             if (persistenceManager.areIntentsDelayed()) {

mobile/com.sap.sailing.android.tracking.app/build.gradle

@@ -5,13 +5,13 @@ def packageName = "com.sap.sailing.android.tracking.app"
 def verCode = 1
 
 android {
-    buildToolsVersion "22.0.1"
-    compileSdkVersion 22
+    buildToolsVersion rootProject.ext.buildTools
+    compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
         applicationId packageName
-        minSdkVersion 14
-        targetSdkVersion 22
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
         versionCode verCode
         versionName "$verCode - Altitude"
         useJack false // not working on Windows yet
@@ -69,25 +69,25 @@ android {
 
 dependencies {
     /* support libraries */
-    compile "com.android.support:appcompat-v7:22.1.1"
+    compile "com.android.support:appcompat-v7:${rootProject.ext.support}"
 
     /* Google Play Services */
-    compile "com.google.android.gms:play-services-gcm:7.3.0"
-    compile "com.google.android.gms:play-services-location:7.3.0"
+    compile "com.google.android.gms:play-services-gcm:${rootProject.ext.play_services}"
+    compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* local dependencies */
     compile project(":mobile:com.sap.sailing.android.shared")
 
     /* JVM tests */
-    testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:1.9.5"
+    testCompile "junit:junit:${rootProject.ext.junit}"
+    testCompile "org.mockito:mockito-core:${rootProject.ext.mockito}"
 
     /* UI testing with espresso */
-    androidTestCompile "com.android.support:support-annotations:22.1.1"
-    androidTestCompile "com.android.support.test:runner:0.2"
-    androidTestCompile "com.android.support.test:rules:0.2"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:2.1"
-    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:2.1") {
+    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
+    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
+    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
+    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
+    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
         exclude group: "com.android.support", module: "appcompat"
         exclude group: "com.android.support", module: "support-v4"
         exclude module: "recyclerview-v7"

mobile/com.sap.sailing.buoy.positioning/build.gradle

@@ -5,13 +5,13 @@ def packageName = "com.sap.sailing.buoy.positioning.app"
 def verCode = 1
 
 android {
-    buildToolsVersion "22.0.1"
-    compileSdkVersion 22
+    buildToolsVersion rootProject.ext.buildTools
+    compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
         applicationId packageName
-        minSdkVersion 14
-        targetSdkVersion 22
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
         versionCode verCode
         versionName "$verCode - Altitude"
         useJack false // not working on Windows yet
@@ -69,24 +69,24 @@ android {
 
 dependencies {
     /* support libraries */
-    compile "com.android.support:appcompat-v7:22.1.1"
+    compile "com.android.support:appcompat-v7:${rootProject.ext.support}"
 
     /* Google Play Services */
-    compile "com.google.android.gms:play-services-location:7.3.0"
+    compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* local dependencies */
     compile project(":mobile:com.sap.sailing.android.shared")
 
     /* JVM tests */
-    testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:1.9.5"
+    testCompile "junit:junit:${rootProject.ext.junit}"
+    testCompile "org.mockito:mockito-core:${rootProject.ext.mockito}"
 
     /* UI testing with espresso */
-    androidTestCompile "com.android.support:support-annotations:22.1.1"
-    androidTestCompile "com.android.support.test:runner:0.2"
-    androidTestCompile "com.android.support.test:rules:0.2"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:2.1"
-    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:2.1") {
+    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
+    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
+    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
+    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
+    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
         exclude group: "com.android.support", module: "appcompat"
         exclude group: "com.android.support", module: "support-v4"
         exclude module: "recyclerview-v7"

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java

@@ -1,5 +1,7 @@
 package com.sap.sailing.android.buoy.positioning.app.ui.fragments;
 
+import java.text.DecimalFormat;
+
 import android.content.Context;
 import android.location.Location;
 import android.location.LocationListener;
@@ -23,14 +25,15 @@ import com.sap.sailing.android.buoy.positioning.app.util.PingHelper;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkInfo;
 import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkPingInfo;
 import com.sap.sailing.android.shared.data.LeaderboardInfo;
+import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.customviews.OpenSansButton;
 import com.sap.sailing.android.shared.ui.customviews.OpenSansTextView;
 import com.sap.sailing.android.shared.ui.customviews.SignalQualityIndicatorView;
 import com.sap.sailing.android.ui.fragments.BaseFragment;
 
-import java.text.DecimalFormat;
-
 public class BuoyFragment extends BaseFragment implements LocationListener {
+    private static final int GPS_MIN_DISTANCE = 1;
+    private static final int GPS_MIN_TIME = 1000;
     private OpenSansTextView markHeaderTextView;
     private OpenSansTextView latitudeTextView;
     private OpenSansTextView longitudeTextView;
@@ -80,7 +83,7 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
         signalQualityIndicatorView.setSignalQuality(GPSQuality.noSignal.toInt());
         if (mark != null) {
             markHeaderTextView.setText(mark.getName());
-            setUpTextUI(null);
+            setUpTextUI(lastKnownLocation);
             GoogleMap map = mapFragment.getMap();
             configureMap(map);
             updateMap();
@@ -124,6 +127,11 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
             accuracyText += " (" + String.format(accuracyString, accuracyFormatter.format(markPing.getAccuracy()))
                     + ")";
         }
+        
+          ExLog.w(getActivity(), getTag(), "Setting latitude to: "+latitudeText);
+          ExLog.w(getActivity(), getTag(), "Setting longitude to: "+longitudeText);
+          ExLog.w(getActivity(), getTag(), "Setting accuracy to: "+accuracyText);
+        
         latitudeTextView.setText(latitudeText);
         longitudeTextView.setText(longitudeText);
         accuracyTextView.setText(accuracyText);
@@ -179,7 +187,13 @@ public class BuoyFragment extends BaseFragment implements LocationListener {
     private void initLocationProvider() {
         locationManager = (LocationManager) getActivity().getSystemService(Context.LOCATION_SERVICE);
         locationManager.removeUpdates(this);
-        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 10000, 10, this);
+        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, GPS_MIN_TIME, GPS_MIN_DISTANCE, this);
+        
+        Location initialLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+        
+        if (initialLocation != null) {
+            onLocationChanged(initialLocation);
+        }
     }
 
     public void updateMap() {

mobile/com.sap.sailing.racecommittee.app/.classpath

@@ -9,5 +9,6 @@
 	<classpathentry exported="true" kind="lib" path="libs/drag-sort-listview-0.6.1-SNAPSHOT.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.json.simple"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="/com.sap.sailing.targetplatform.base/plugins/target-test/mockito-core-1.10.14.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

mobile/com.sap.sailing.racecommittee.app/build.gradle

@@ -5,13 +5,13 @@ def packageName = "com.sap.sailing.racecommittee.app"
 def verCode = 7
 
 android {
-    buildToolsVersion "22.0.1"
-    compileSdkVersion 22
+    buildToolsVersion rootProject.ext.buildTools
+    compileSdkVersion rootProject.ext.compileSdk
 
     defaultConfig {
         applicationId packageName
-        minSdkVersion 14
-        targetSdkVersion 22
+        minSdkVersion rootProject.ext.minSdk
+        targetSdkVersion rootProject.ext.targetSdk
         versionCode verCode
         versionName "$verCode - Laser"
         useJack false // not working on Windows yet
@@ -75,11 +75,11 @@ dependencies {
     compile "com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.6.2"
 
     /* support libraries */
-    compile "com.android.support:appcompat-v7:22.1.1"
-    compile "com.android.support:recyclerview-v7:22.1.1"
+    compile "com.android.support:appcompat-v7:${rootProject.ext.support}"
+    compile "com.android.support:recyclerview-v7:${rootProject.ext.support}"
 
     /* Google Play Services */
-    compile "com.google.android.gms:play-services-location:7.3.0"
+    compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
 
     /* local dependencies */
     compile project(":mobile:com.sap.sailing.android.shared")
@@ -88,15 +88,15 @@ dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
 
     /* JVM tests */
-    testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:1.9.5"
+    testCompile "junit:junit:${rootProject.ext.junit}"
+    testCompile "org.mockito:mockito-core:${rootProject.ext.mockito}"
 
     /* UI testing with espresso */
-    androidTestCompile "com.android.support:support-annotations:22.1.1"
-    androidTestCompile "com.android.support.test:runner:0.2"
-    androidTestCompile "com.android.support.test:rules:0.2"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:2.1"
-    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:2.1") {
+    androidTestCompile "com.android.support:support-annotations:${rootProject.ext.support}"
+    androidTestCompile "com.android.support.test:runner:${rootProject.ext.test}"
+    androidTestCompile "com.android.support.test:rules:${rootProject.ext.test}"
+    androidTestCompile "com.android.support.test.espresso:espresso-core:${rootProject.ext.espresso}"
+    androidTestCompile ("com.android.support.test.espresso:espresso-contrib:${rootProject.ext.espresso}") {
         exclude group: "com.android.support", module: "appcompat"
         exclude group: "com.android.support", module: "support-v4"
         exclude module: "recyclerview-v7"

mobile/git.gradle

@@ -33,6 +33,10 @@ preBuild.doLast {
         git_branch_or_tag = git_tag.toString().trim()
     }
 
+    if (git_branch_or_tag.size() == 0) {
+        git_branch_or_tag = "HEAD"
+    }
+
     def build_time = new Date().toString()
 
     // save the combined build info into assets/build.info file