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

mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/NetworkHelper.java

@@ -36,7 +36,6 @@ public class NetworkHelper {
 
     public void executeHttpJsonRequestAsnchronously(HttpRequest request, NetworkHelperSuccessListener successListener,
             NetworkHelperFailureListener failureListener) {
-
         NetworkRequestTask task = new NetworkRequestTask(successListener, failureListener);
         task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, request);
     }
@@ -62,13 +61,10 @@ public class NetworkHelper {
             try {
                 stream = request.execute();
                 String responseStr = readStream(stream);
-
                 response = null;
-
                 if (responseStr.length() > 0) {
                     response = new JSONObject(responseStr);
                 }
-
                 isSuccess = true;
             } catch (IOException e) {
                 error = new NetworkHelperError(e.getMessage());
@@ -76,7 +72,6 @@ public class NetworkHelper {
                 error = new NetworkHelperError(e.getMessage());
                 ExLog.e(mContext, TAG, "Failed to parse JSON: " + e.getMessage());
             }
-
             return null;
         }
 

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java

@@ -58,13 +58,11 @@ public class CheckinManager {
 
     public void callServerAndGenerateCheckinData() {
         Uri uri = Uri.parse(url);
-
         // TODO: assuming scheme is http, is this valid?
         String scheme = uri.getScheme();
         if (scheme != "http" && scheme != "https") {
             scheme = "http";
         }
-
         final URLData urlData = extractRequestParametersFromUri(uri, scheme);
         if (urlData == null) {
             setCheckinData(null);
@@ -76,7 +74,6 @@ public class CheckinManager {
         try {
             HttpGetRequest getLeaderboardRequest = new HttpGetRequest(new URL(urlData.getLeaderboardUrl), mContext);
             getLeaderBoardFromServer(urlData, getLeaderboardRequest);
-
         } catch (MalformedURLException e) {
             ExLog.e(mContext, TAG,
                     "Error: Failed to perform checking due to a MalformedURLException: " + e.getMessage());
@@ -115,13 +112,9 @@ public class CheckinManager {
     private void getLeaderBoardFromServer(final URLData urlData, HttpGetRequest getLeaderboardRequest) {
         NetworkHelper.getInstance(mContext).executeHttpJsonRequestAsnchronously(getLeaderboardRequest,
                 new NetworkHelper.NetworkHelperSuccessListener() {
-
                     @Override
                     public void performAction(JSONObject response) {
-                        // TODO Auto-generated method stub
-
                         final String leaderboardName;
-
                         try {
                             leaderboardName = response.getString("name");
                             urlData.getMarkUrl = urlData.hostWithPort + prefs.getServerMarkPath(leaderboardName);
@@ -143,9 +136,7 @@ public class CheckinManager {
                             ExLog.e(mContext, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e1.getMessage());
                         }
                     }
-
                 }, new NetworkHelper.NetworkHelperFailureListener() {
-
                     @Override
                     public void performAction(NetworkHelper.NetworkHelperError e) {
                         ExLog.e(mContext, TAG, "Failed to get event from API: " + e.getMessage());

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/DependentRaceSpinnerAdapter.java

@@ -116,7 +116,7 @@ public class DependentRaceSpinnerAdapter implements SpinnerAdapter {
 
     @Override
     public int getViewTypeCount() {
-        return 2;
+        return 1;
     }
 
     @Override