eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-27 22:37:15 +00:00
Code Activity

Merge branch 'ubilabs--tracking_app--develop'

Browse Source 
Conflicts:
	mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
This commit is contained in:
Axel Uhl committed 2015-08-12 15:32:49 +02:00
2 parents b173afc779 5336b3e9f0
commit 1cae206254
2 files changed
-9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/CheckinManager.java
-5
View File
@@ -45,12 +45,7 @@ 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) {
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
-4
View File
@@ -58,11 +58,7 @@ 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);