diff --git a/.gitignore b/.gitignore
index 5b4b102919c..3bb167e6a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ out/
local.properties
git.xml
build.info
+mobile/github-advrecyclerview_lib/bin
diff --git a/build.gradle b/build.gradle
index 04c172858b7..6a7d068b950 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
buildscript {
repositories {
- mavenCentral()
+ jcenter()
}
dependencies {
@@ -12,11 +12,13 @@ buildscript {
allprojects {
repositories {
- mavenCentral()
+ jcenter()
}
+
version = "1.0.0-SNAPSHOT"
+
tasks.withType(JavaCompile) {
- sourceCompatibility = "1.7"
- targetCompatibility = "1.7"
+ sourceCompatibility = "1.7"
+ targetCompatibility = "1.7"
}
}
diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh
index e0c1f86847a..7edc90fcff7 100755
--- a/configuration/buildAndUpdateProduct.sh
+++ b/configuration/buildAndUpdateProduct.sh
@@ -633,7 +633,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
extra="$extra -Dtracking-app-version=$TRACKING_APP_VERSION"
NOW=$(date +"%s")
- BUILD_TOOLS=22.0.0
+ BUILD_TOOLS=22.0.1
TARGET_API=22
TEST_API=18
ANDROID_ABI=armeabi-v7a
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760dc9..76bab278203 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
diff --git a/java/CodeFormatter_IntelliJ.jar b/java/CodeFormatter_IntelliJ.jar
index 6c9353124cd..ae4484fa93d 100644
Binary files a/java/CodeFormatter_IntelliJ.jar and b/java/CodeFormatter_IntelliJ.jar differ
diff --git a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
index aefd1e3ffb6..e6230b9950b 100755
--- a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
+++ b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/Flags.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/Flags.java
index f4ca021f443..473de1a6685 100644
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/Flags.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/Flags.java
@@ -12,8 +12,10 @@ public enum Flags {
GOLF,
HOTEL,
INDIA,
+ INDIA_ZULU, // the flag combination of I+Z flown at the same time
NOVEMBER,
PAPA,
+ UNIFORM,
XRAY,
ZULU,
FIRSTSUBSTITUTE,
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RRS26StartModeFlagFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RRS26StartModeFlagFinder.java
index ee295352e91..ee38d3ac55e 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RRS26StartModeFlagFinder.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/analyzing/impl/RRS26StartModeFlagFinder.java
@@ -11,7 +11,7 @@ import com.sap.sailing.domain.common.racelog.RacingProcedureType;
public class RRS26StartModeFlagFinder extends RaceLogAnalyzer {
- private final static List defaultStartModeFlags = Arrays.asList(Flags.PAPA, Flags.ZULU, Flags.BLACK, Flags.INDIA);
+ private final static List defaultStartModeFlags = Arrays.asList(Flags.PAPA, Flags.ZULU, Flags.BLACK, Flags.INDIA, Flags.UNIFORM, Flags.INDIA_ZULU);
private final RacingProcedureTypeAnalyzer procedureAnalyzer;
private final List startModeFlags;
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateChangedListeners.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateChangedListeners.java
index 0e9e707f95f..18e06c05d96 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateChangedListeners.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/impl/RaceStateChangedListeners.java
@@ -81,10 +81,8 @@ public class RaceStateChangedListeners extends HashSet
@Override
public void onWindFixChanged(ReadonlyRaceState state) {
- // TODO Auto-generated method stub
-
+ for (RaceStateChangedListener listener : this) {
+ listener.onWindFixChanged(state);
+ }
}
-
-
-
}
diff --git a/java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs b/java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
index 1d7dc1d4b1a..aad12768896 100755
--- a/java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
+++ b/java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
@@ -1,4 +1,4 @@
eclipse.preferences.version=1
entryPointModules=
filesCopiedToWebInfLib=gwt-servlet.jar
-gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDQgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC51aS5BZG1pbkNvbnNvbGU8L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc2FpbGluZy5nd3QudWkuTGVhZGVyYm9hcmQ8L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc2FpbGluZy5nd3QudWkuTGVhZGVyYm9hcmRFZGl0aW5nPC9lbnRyeS1wb2ludC1tb2R1bGU+PGVudHJ5LXBvaW50LW1vZHVsZT5jb20uc2FwLnNhaWxpbmcuZ3d0LnVpLlJhY2VCb2FyZDwvZW50cnktcG9pbnQtbW9kdWxlPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC51aS5TcGVjdGF0b3I8L2VudHJ5LXBvaW50LW1vZHVsZT48ZW50cnktcG9pbnQtbW9kdWxlPmNvbS5zYXAuc2FpbGluZy5nd3QudWkuRGF0YU1pbmluZzwvZW50cnktcG9pbnQtbW9kdWxlPjwvZ3d0LWNvbXBpbGUtc2V0dGluZ3M+
+gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBWy13YXIgLiAtbG9jYWxXb3JrZXJzIDQgLXN0cmljdCAtbG9nTGV2ZWwgVFJBQ0VdXT48L2V4dHJhLWFyZ3M+PHZtLWFyZ3M+PCFbQ0RBVEFbLVhteDIwMjRtIC1EZ3d0LnVzZWFyY2hpdmVzPWZhbHNlXV0+PC92bS1hcmdzPjxlbnRyeS1wb2ludC1tb2R1bGU+Y29tLnNhcC5zYWlsaW5nLmd3dC5yZWdhdHRhb3ZlcnZpZXcuUmVnYXR0YU92ZXJ2aWV3PC9lbnRyeS1wb2ludC1tb2R1bGU+PC9nd3QtY29tcGlsZS1zZXR0aW5ncz4\=
diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch b/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
index db3522bde16..7c55b6a1b87 100755
--- a/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
@@ -1,60 +1,60 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.gwt.ui/WEB-INF/classes/.dummy b/java/com.sap.sailing.gwt.ui/WEB-INF/classes/.dummy
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagImageResolver.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagImageResolver.java
index 5504cd68e49..f396d0472ea 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagImageResolver.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagImageResolver.java
@@ -32,8 +32,10 @@ public class FlagImageResolver {
flagImageMap.put(Flags.GOLF, resources.flagGolf());
flagImageMap.put(Flags.HOTEL, resources.flagHotel());
flagImageMap.put(Flags.INDIA, resources.flagIndia());
+ flagImageMap.put(Flags.INDIA_ZULU, resources.flagIndiaZulu());
flagImageMap.put(Flags.NOVEMBER, resources.flagNovember());
flagImageMap.put(Flags.PAPA, resources.flagPapa());
+ flagImageMap.put(Flags.UNIFORM, resources.flagUniform());
flagImageMap.put(Flags.XRAY, resources.flagXray());
flagImageMap.put(Flags.ZULU, resources.flagZulu());
}
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagsMeaningExplanator.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagsMeaningExplanator.java
index c940ed7dc56..3f5f418fe48 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagsMeaningExplanator.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/FlagsMeaningExplanator.java
@@ -14,13 +14,13 @@ public class FlagsMeaningExplanator {
return stringMessages.papaDisplayed();
} else if (upperFlag.equals(Flags.BLACK) && displayed) {
return stringMessages.blackDisplayed();
- } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA)) && displayed) {
+ } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA) || upperFlag.equals(Flags.INDIA_ZULU) || upperFlag.equals(Flags.UNIFORM)) && displayed) {
return stringMessages.zuluIndiaDisplayed();
} else if (upperFlag.equals(Flags.PAPA) && !displayed) {
return stringMessages.papaRemoved();
} else if (upperFlag.equals(Flags.BLACK) && !displayed) {
return stringMessages.blackRemoved();
- } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA)) && !displayed) {
+ } else if ((upperFlag.equals(Flags.ZULU) || upperFlag.equals(Flags.INDIA) || upperFlag.equals(Flags.INDIA_ZULU) || upperFlag.equals(Flags.UNIFORM)) && !displayed) {
return stringMessages.zuluIndiaRemoved();
} else if (upperFlag.equals(Flags.CLASS) && !displayed) {
return stringMessages.classFlagRemoved();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesFlagsResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesFlagsResources.java
index 454bcafa8a2..a18aee8db25 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesFlagsResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesFlagsResources.java
@@ -43,12 +43,18 @@ interface RegattaRaceStatesFlagsResources extends ClientBundle {
@Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/india.png")
ImageResource flagIndia();
+ @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/india_zulu.png")
+ ImageResource flagIndiaZulu();
+
@Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/november.png")
ImageResource flagNovember();
@Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/papa.png")
ImageResource flagPapa();
+ @Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/uniform.png")
+ ImageResource flagUniform();
+
@Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/whiskey.png")
ImageResource flagWhiskey();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigurationDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigurationDialog.java
index 9e9d6fb20de..609acfc6a51 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigurationDialog.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaConfigurationDialog.java
@@ -387,21 +387,17 @@ public class RegattaConfigurationDialog extends DataEntryDialog= 0) {
RacingProcedureType type = RacingProcedureType.valueOf(racingProcedureListBox.getValue(index));
result.defaultRacingProcedureType = type == RacingProcedureType.UNKNOWN ? null : type;
}
-
result.defaultRacingProcedureType = getSelectedRacingProcedure();
-
index = designerModeEntryListBox.getSelectedIndex();
if (index >= 0) {
CourseDesignerMode mode = CourseDesignerMode.valueOf(designerModeEntryListBox.getValue(index));
result.defaultCourseDesignerMode = mode == CourseDesignerMode.UNKNOWN ? null : mode;
}
-
if (rrs26EnabledBox.getValue()) {
result.rrs26Configuration = new DeviceConfigurationDTO.RegattaConfigurationDTO.RRS26ConfigurationDTO();
getRacingProcedureConfigurationResults(result.rrs26Configuration, rrs26ClassFlagListBox, rrs26RecallBox);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
index 051ab8fcbb7..e95fb38576f 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeDTO.java
@@ -1,26 +1,25 @@
-package com.sap.sailing.gwt.ui.shared;
-
-import java.io.Serializable;
-
-import com.sap.sailing.domain.common.Position;
-
-
-public class WindLatticeDTO implements Serializable {
-
- /**
- * Generated uid for serialisation
- */
- private static final long serialVersionUID = -2110785502151983845L;
- private Position [][] matrix;
-
- public WindLatticeDTO() {
- }
-
- public void setMatrix( Position [][] matrix ) {
- this.matrix = matrix;
- }
-
- public Position[][] getMatrix() {
- return matrix;
- }
-}
+package com.sap.sailing.gwt.ui.shared;
+
+import java.io.Serializable;
+
+import com.sap.sailing.domain.common.Position;
+
+public class WindLatticeDTO implements Serializable {
+
+ /**
+ * Generated uid for serialisation
+ */
+ private static final long serialVersionUID = -2110785502151983845L;
+ private Position [][] matrix;
+
+ public WindLatticeDTO() {
+ }
+
+ public void setMatrix( Position [][] matrix ) {
+ this.matrix = matrix;
+ }
+
+ public Position[][] getMatrix() {
+ return matrix;
+ }
+}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
index d3f5f5d6e28..bce6e5838f1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/WindLatticeGenParamsDTO.java
@@ -1,64 +1,63 @@
-package com.sap.sailing.gwt.ui.shared;
-
-import java.io.Serializable;
-
-import com.sap.sailing.domain.common.Position;
-
-
-public class WindLatticeGenParamsDTO implements Serializable {
-
- /**
- * Generated uid for serialisation
- */
- private static final long serialVersionUID = 6074038176026601942L;
-
- private Position center;
- private double xSize = 1;
- private double ySize = 1;
- private int gridsizeX = 20;
- private int gridsizeY = 20;
-
- public WindLatticeGenParamsDTO() {
- }
-
- public void setCenter(Position center) {
- this.center = center;
- }
-
- public Position getCenter() {
- return center;
- }
-
- public double getxSize() {
- return xSize;
- }
-
- public void setxSize(double xSize) {
- this.xSize = xSize;
- }
-
- public double getySize() {
- return ySize;
- }
-
- public void setySize(double ySize) {
- this.ySize = ySize;
- }
-
- public int getGridsizeX() {
- return gridsizeX;
- }
-
- public void setGridsizeX(int gridsizeX) {
- this.gridsizeX = gridsizeX;
- }
-
- public int getGridsizeY() {
- return gridsizeY;
- }
-
- public void setGridsizeY(int gridsizeY) {
- this.gridsizeY = gridsizeY;
- }
-
-}
+package com.sap.sailing.gwt.ui.shared;
+
+import java.io.Serializable;
+
+import com.sap.sailing.domain.common.Position;
+
+public class WindLatticeGenParamsDTO implements Serializable {
+
+ /**
+ * Generated uid for serialisation
+ */
+ private static final long serialVersionUID = 6074038176026601942L;
+
+ private Position center;
+ private double xSize = 1;
+ private double ySize = 1;
+ private int gridsizeX = 20;
+ private int gridsizeY = 20;
+
+ public WindLatticeGenParamsDTO() {
+ }
+
+ public void setCenter(Position center) {
+ this.center = center;
+ }
+
+ public Position getCenter() {
+ return center;
+ }
+
+ public double getxSize() {
+ return xSize;
+ }
+
+ public void setxSize(double xSize) {
+ this.xSize = xSize;
+ }
+
+ public double getySize() {
+ return ySize;
+ }
+
+ public void setySize(double ySize) {
+ this.ySize = ySize;
+ }
+
+ public int getGridsizeX() {
+ return gridsizeX;
+ }
+
+ public void setGridsizeX(int gridsizeX) {
+ this.gridsizeX = gridsizeX;
+ }
+
+ public int getGridsizeY() {
+ return gridsizeY;
+ }
+
+ public void setGridsizeY(int gridsizeY) {
+ this.gridsizeY = gridsizeY;
+ }
+
+}
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/DispatchContextImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/DispatchContextImpl.java
index 1813050dcaf..07bdf1c75dc 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/DispatchContextImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/DispatchContextImpl.java
@@ -3,9 +3,10 @@ package com.sap.sailing.gwt.ui.shared.dispatch;
import java.util.Date;
import java.util.Locale;
+import com.google.gwt.core.shared.GwtIncompatible;
import com.sap.sailing.server.RacingEventService;
-
+@GwtIncompatible
public class DispatchContextImpl implements DispatchContext {
private final RacingEventService racingEventService;
private final Date currentClientTime;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/NextRaceFinder.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/NextRaceFinder.java
index 70f8f4b6795..b9e3d1978b5 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/NextRaceFinder.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/NextRaceFinder.java
@@ -1,10 +1,12 @@
package com.sap.sailing.gwt.ui.shared.dispatch.event;
+import com.google.gwt.core.shared.GwtIncompatible;
import com.sap.sailing.gwt.ui.shared.dispatch.event.RacesActionUtil.RaceCallback;
import com.sap.sailing.gwt.ui.shared.race.RaceMetadataDTO.RaceTrackingState;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.impl.MillisecondsTimePoint;
+@GwtIncompatible
public class NextRaceFinder implements RaceCallback {
private final TimePoint now = MillisecondsTimePoint.now();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml
index 990a01dc90a..0787b4188de 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/Home.gwt.xml
@@ -94,8 +94,6 @@
-
-
-
-
+
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/india_zulu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/india_zulu.png
new file mode 100755
index 00000000000..b46c3732201
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/india_zulu.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/uniform.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/uniform.png
new file mode 100755
index 00000000000..0c8e4ad522a
Binary files /dev/null and b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/uniform.png differ
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer.java
index e380e6b12b5..f4c86031ac1 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer.java
@@ -23,6 +23,7 @@ import com.sap.sse.common.Util.Pair;
*/
public class FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer implements
JsonDeserializer>> {
+ public static final String ACCURACY = "accuracy";
@Override
public Pair> deserialize(JSONObject object) throws JsonDeserializationException {
diff --git a/java/com.sap.sse.security.common/build.gradle b/java/com.sap.sse.security.common/build.gradle
old mode 100755
new mode 100644
index 7d74252932f..aa2ca8edd5a
--- a/java/com.sap.sse.security.common/build.gradle
+++ b/java/com.sap.sse.security.common/build.gradle
@@ -9,4 +9,4 @@ sourceSets {
dependencies {
/* local dependencies */
compile project(":java:com.sap.sse.common")
-}
+}
\ No newline at end of file
diff --git a/java/com.sap.sse.security.ui/WEB-INF/.gitignore b/java/com.sap.sse.security.ui/WEB-INF/.gitignore
index 3c6742f8d29..8541464a78c 100644
--- a/java/com.sap.sse.security.ui/WEB-INF/.gitignore
+++ b/java/com.sap.sse.security.ui/WEB-INF/.gitignore
@@ -1 +1 @@
-deploy
\ No newline at end of file
+deploy
diff --git a/java/com.sap.sse.security.ui/WEB-INF/classes/.dummy b/java/com.sap.sse.security.ui/WEB-INF/classes/.dummy
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/mobile/com.sap.sailing.android.shared/.classpath b/mobile/com.sap.sailing.android.shared/.classpath
index 27faaa542fd..a0a969274af 100755
--- a/mobile/com.sap.sailing.android.shared/.classpath
+++ b/mobile/com.sap.sailing.android.shared/.classpath
@@ -1,16 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mobile/com.sap.sailing.android.shared/build.gradle b/mobile/com.sap.sailing.android.shared/build.gradle
index 1f19a6f2091..7533d30a04c 100644
--- a/mobile/com.sap.sailing.android.shared/build.gradle
+++ b/mobile/com.sap.sailing.android.shared/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'
android {
- buildToolsVersion "22.0.0"
+ buildToolsVersion "22.0.1"
compileSdkVersion 22
defaultConfig {
@@ -35,7 +35,7 @@ android {
dependencies {
/* support libraries */
- compile 'com.android.support:appcompat-v7:22.0.0'
+ compile 'com.android.support:appcompat-v7:22.1.1'
/* local dependencies */
compile project(':java:com.sap.sailing.domain.common')
@@ -45,7 +45,7 @@ dependencies {
compile project(':java:org.json.simple')
/* Google Play Services */
- compile "com.google.android.gms:play-services-location:6.5.87"
+ compile "com.google.android.gms:play-services-location:7.3.0"
/* all local jar-libs */
compile fileTree(dir: "libs", include: ["*.jar"])
}
diff --git a/mobile/com.sap.sailing.android.shared/lint.xml b/mobile/com.sap.sailing.android.shared/lint.xml
index ee0eead5bb7..9c8f6c659a3 100644
--- a/mobile/com.sap.sailing.android.shared/lint.xml
+++ b/mobile/com.sap.sailing.android.shared/lint.xml
@@ -1,3 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/project.properties b/mobile/com.sap.sailing.android.shared/project.properties
index aa9d405b8a9..f704efba5e6 100755
--- a/mobile/com.sap.sailing.android.shared/project.properties
+++ b/mobile/com.sap.sailing.android.shared/project.properties
@@ -11,7 +11,7 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=Google Inc.:Google APIs:21
+target=Google Inc.:Google APIs:22
android.library=true
android.library.reference.1=../google-android-support-v7-appcompat_lib
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ad.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ad.png
new file mode 100644
index 00000000000..24efae590e8
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ad.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ae.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ae.png
new file mode 100644
index 00000000000..05acc83dea5
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ae.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_af.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_af.png
new file mode 100644
index 00000000000..491039ba49a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_af.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ag.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ag.png
new file mode 100644
index 00000000000..08c171d2e11
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ag.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ai.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ai.png
new file mode 100644
index 00000000000..4c6b36d47ed
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ai.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_al.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_al.png
new file mode 100644
index 00000000000..16e86a66f37
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_al.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_am.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_am.png
new file mode 100644
index 00000000000..b1f25ba0203
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_am.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_an.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_an.png
new file mode 100644
index 00000000000..8236bfde51d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_an.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ao.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ao.png
new file mode 100644
index 00000000000..d0fb098a1aa
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ao.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_aq.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_aq.png
new file mode 100644
index 00000000000..52c2833058e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_aq.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ar.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ar.png
new file mode 100644
index 00000000000..bfa366f0be2
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ar.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_as.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_as.png
new file mode 100644
index 00000000000..45c3ed064a5
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_as.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_at.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_at.png
new file mode 100644
index 00000000000..bfe3827faeb
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_at.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_au.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_au.png
new file mode 100644
index 00000000000..5f6e3254d7c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_au.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_aw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_aw.png
new file mode 100644
index 00000000000..007f032ee1a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_aw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ax.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ax.png
new file mode 100644
index 00000000000..e11d1f3d311
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ax.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_az.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_az.png
new file mode 100644
index 00000000000..ac0cbd8b9a3
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_az.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ba.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ba.png
new file mode 100644
index 00000000000..d97b8515094
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ba.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bb.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bb.png
new file mode 100644
index 00000000000..c84c6ac9054
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bb.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bd.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bd.png
new file mode 100644
index 00000000000..57cc9f61a36
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bd.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_be.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_be.png
new file mode 100644
index 00000000000..1473666732f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_be.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bf.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bf.png
new file mode 100644
index 00000000000..dc297435db9
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bf.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bg.png
new file mode 100644
index 00000000000..ba98171b39d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bh.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bh.png
new file mode 100644
index 00000000000..38d195c1823
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bh.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bi.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bi.png
new file mode 100644
index 00000000000..04c84ba8626
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bi.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bj.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bj.png
new file mode 100644
index 00000000000..1e5582add19
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bj.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bl.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bl.png
new file mode 100644
index 00000000000..bdac5e09bb1
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bl.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bm.png
new file mode 100644
index 00000000000..5b989c17272
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bn.png
new file mode 100644
index 00000000000..c7934020120
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bo.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bo.png
new file mode 100644
index 00000000000..f58824f75fd
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bo.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_br.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_br.png
new file mode 100644
index 00000000000..13bce838ffc
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_br.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bs.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bs.png
new file mode 100644
index 00000000000..15e06827fc6
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bs.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bt.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bt.png
new file mode 100644
index 00000000000..a83a1373b5a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bt.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bw.png
new file mode 100644
index 00000000000..45f9717e680
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_by.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_by.png
new file mode 100644
index 00000000000..8d6dc575a49
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_by.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_bz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bz.png
new file mode 100644
index 00000000000..f3fe26c6a64
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_bz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ca.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ca.png
new file mode 100644
index 00000000000..fd82ed4d955
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ca.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cc.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cc.png
new file mode 100644
index 00000000000..2c1d9e3e104
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cc.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cd.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cd.png
new file mode 100644
index 00000000000..502bc015e99
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cd.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cf.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cf.png
new file mode 100644
index 00000000000..82029ea8cbc
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cf.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cg.png
new file mode 100644
index 00000000000..187226c9d1a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ch.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ch.png
new file mode 100644
index 00000000000..368e22606ea
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ch.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ci.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ci.png
new file mode 100644
index 00000000000..c7a3a60b69a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ci.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ck.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ck.png
new file mode 100644
index 00000000000..621c3ff5629
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ck.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cl.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cl.png
new file mode 100644
index 00000000000..eaa32e34e54
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cl.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cm.png
new file mode 100644
index 00000000000..95637214a67
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cn.png
new file mode 100644
index 00000000000..d75026aac00
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_co.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_co.png
new file mode 100644
index 00000000000..418df18b42f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_co.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cr.png
new file mode 100644
index 00000000000..6e725120cec
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cu.png
new file mode 100644
index 00000000000..6430524de92
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cv.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cv.png
new file mode 100644
index 00000000000..cc3d4e86622
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cv.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cw.png
new file mode 100644
index 00000000000..78981b1257b
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cx.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cx.png
new file mode 100644
index 00000000000..b9384b2c96d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cx.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cy.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cy.png
new file mode 100644
index 00000000000..3ea9c9ef683
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cy.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_cz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cz.png
new file mode 100644
index 00000000000..b38296bd262
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_cz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_de.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_de.png
new file mode 100644
index 00000000000..07707aa0ff7
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_de.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_dj.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dj.png
new file mode 100644
index 00000000000..794e74c1229
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dj.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_dk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dk.png
new file mode 100644
index 00000000000..ef9f52f426a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_dm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dm.png
new file mode 100644
index 00000000000..f7da4c87c97
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_do.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_do.png
new file mode 100644
index 00000000000..c34a32f38bf
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_do.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_dz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dz.png
new file mode 100644
index 00000000000..2ea6765cc9a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_dz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ec.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ec.png
new file mode 100644
index 00000000000..26aaeaaf744
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ec.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ee.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ee.png
new file mode 100644
index 00000000000..c18c562a65c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ee.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_eg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_eg.png
new file mode 100644
index 00000000000..8cd5b82530c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_eg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_eh.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_eh.png
new file mode 100644
index 00000000000..7b4eb90382e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_eh.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_er.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_er.png
new file mode 100644
index 00000000000..fa60b10e279
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_er.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_es.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_es.png
new file mode 100644
index 00000000000..3f7e39c1e4a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_es.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_et.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_et.png
new file mode 100644
index 00000000000..e1388a0d543
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_et.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_eu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_eu.png
new file mode 100644
index 00000000000..4f8409474ca
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_eu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_fi.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fi.png
new file mode 100644
index 00000000000..6eb7e94c995
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fi.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_fj.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fj.png
new file mode 100644
index 00000000000..fafdaae7854
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fj.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_fk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fk.png
new file mode 100644
index 00000000000..eb2dd3cc14e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_fm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fm.png
new file mode 100644
index 00000000000..be7af700319
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_fo.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fo.png
new file mode 100644
index 00000000000..7942cd99c13
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fo.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_fr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fr.png
new file mode 100644
index 00000000000..ea101a56008
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_fr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ga.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ga.png
new file mode 100644
index 00000000000..1b69eafc626
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ga.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gb.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gb.png
new file mode 100644
index 00000000000..96a97f7f9b5
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gb.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gd.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gd.png
new file mode 100644
index 00000000000..d4a05adb95a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gd.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ge.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ge.png
new file mode 100644
index 00000000000..20269135b6a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ge.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gg.png
new file mode 100644
index 00000000000..8fff55533b3
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gh.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gh.png
new file mode 100644
index 00000000000..2bdcd4f8aed
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gh.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gi.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gi.png
new file mode 100644
index 00000000000..3b8725410c0
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gi.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gl.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gl.png
new file mode 100644
index 00000000000..c7554a89b95
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gl.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gm.png
new file mode 100644
index 00000000000..a54ce953f2f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gn.png
new file mode 100644
index 00000000000..dd795075ce6
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gq.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gq.png
new file mode 100644
index 00000000000..1473173516a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gq.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gr.png
new file mode 100644
index 00000000000..b7da9ccbfce
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gs.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gs.png
new file mode 100644
index 00000000000..a216c57e04d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gs.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gt.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gt.png
new file mode 100644
index 00000000000..6b280670893
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gt.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gu.png
new file mode 100644
index 00000000000..e68eb534220
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gw.png
new file mode 100644
index 00000000000..cdf103a9518
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_gy.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gy.png
new file mode 100644
index 00000000000..1e0632e9414
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_gy.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_hk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hk.png
new file mode 100644
index 00000000000..111a7a67743
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_hn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hn.png
new file mode 100644
index 00000000000..e76b187d2bb
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_hr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hr.png
new file mode 100644
index 00000000000..355c4e873cc
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ht.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ht.png
new file mode 100644
index 00000000000..b958f5b0917
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ht.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_hu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hu.png
new file mode 100644
index 00000000000..afee5693379
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_hu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ic.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ic.png
new file mode 100644
index 00000000000..b0090e4228a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ic.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_id.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_id.png
new file mode 100644
index 00000000000..7fb00cfbbb2
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_id.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ie.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ie.png
new file mode 100644
index 00000000000..ab7af0c37e9
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ie.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_il.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_il.png
new file mode 100644
index 00000000000..ce6937f97ce
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_il.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_im.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_im.png
new file mode 100644
index 00000000000..c1f8bbb57c0
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_im.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_in.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_in.png
new file mode 100644
index 00000000000..9af807275d2
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_in.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_iq.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_iq.png
new file mode 100644
index 00000000000..79e7c2a0310
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_iq.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ir.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ir.png
new file mode 100644
index 00000000000..df273f30761
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ir.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_is.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_is.png
new file mode 100644
index 00000000000..5e198a714f6
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_is.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_it.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_it.png
new file mode 100644
index 00000000000..1ac67df347f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_it.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_je.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_je.png
new file mode 100644
index 00000000000..cc26d520b26
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_je.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_jm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_jm.png
new file mode 100644
index 00000000000..2c59808ca61
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_jm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_jo.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_jo.png
new file mode 100644
index 00000000000..d0b87ec35e7
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_jo.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_jp.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_jp.png
new file mode 100644
index 00000000000..fdd3f5ee03a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_jp.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ke.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ke.png
new file mode 100644
index 00000000000..306548665b8
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ke.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_kg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kg.png
new file mode 100644
index 00000000000..8ea6f5cf71d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_kh.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kh.png
new file mode 100644
index 00000000000..d752ca07181
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kh.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ki.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ki.png
new file mode 100644
index 00000000000..c8dbdb01dc1
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ki.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_km.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_km.png
new file mode 100644
index 00000000000..8a46ac6182a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_km.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_kn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kn.png
new file mode 100644
index 00000000000..a5c0ffb72a0
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_kp.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kp.png
new file mode 100644
index 00000000000..ee768320648
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kp.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_kr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kr.png
new file mode 100644
index 00000000000..b3159e8289c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_kw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kw.png
new file mode 100644
index 00000000000..f5ec795b06e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ky.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ky.png
new file mode 100644
index 00000000000..dac58cde33d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ky.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_kz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kz.png
new file mode 100644
index 00000000000..195d9789066
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_kz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_la.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_la.png
new file mode 100644
index 00000000000..609436dac64
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_la.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_lb.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lb.png
new file mode 100644
index 00000000000..a9ffdbc5438
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lb.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_lc.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lc.png
new file mode 100644
index 00000000000..a2016b2b631
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lc.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_li.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_li.png
new file mode 100644
index 00000000000..791b27af551
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_li.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_lk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lk.png
new file mode 100644
index 00000000000..ecc6f0d5c13
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_lr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lr.png
new file mode 100644
index 00000000000..73aa178c4bc
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ls.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ls.png
new file mode 100644
index 00000000000..598747e0a2c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ls.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_lt.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lt.png
new file mode 100644
index 00000000000..907db39cff5
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lt.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_lu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lu.png
new file mode 100644
index 00000000000..4357a46bff1
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_lv.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lv.png
new file mode 100644
index 00000000000..1f8bdac1bbd
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_lv.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ly.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ly.png
new file mode 100644
index 00000000000..98f7a4ef2be
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ly.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ma.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ma.png
new file mode 100644
index 00000000000..e5b2280279c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ma.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mc.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mc.png
new file mode 100644
index 00000000000..7fb00cfbbb2
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mc.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_md.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_md.png
new file mode 100644
index 00000000000..7bd750c737d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_md.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_me.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_me.png
new file mode 100644
index 00000000000..113a2bc3840
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_me.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mf.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mf.png
new file mode 100644
index 00000000000..7d884716358
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mf.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mg.png
new file mode 100644
index 00000000000..f89c650986d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mh.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mh.png
new file mode 100644
index 00000000000..a240d7046df
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mh.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mk.png
new file mode 100644
index 00000000000..38bb51af750
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ml.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ml.png
new file mode 100644
index 00000000000..6e73f357dae
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ml.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mm.png
new file mode 100644
index 00000000000..ddaab40c5e1
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mn.png
new file mode 100644
index 00000000000..492d87e1f8c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mo.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mo.png
new file mode 100644
index 00000000000..a68ca49f06f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mo.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mp.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mp.png
new file mode 100644
index 00000000000..9ee84172b83
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mp.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mq.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mq.png
new file mode 100644
index 00000000000..3905c2e0b87
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mq.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mr.png
new file mode 100644
index 00000000000..fb2ac8553eb
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ms.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ms.png
new file mode 100644
index 00000000000..9662beb6e7f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ms.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mt.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mt.png
new file mode 100644
index 00000000000..fcc27ab824e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mt.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mu.png
new file mode 100644
index 00000000000..176391ea953
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mv.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mv.png
new file mode 100644
index 00000000000..c41df6d3cce
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mv.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mw.png
new file mode 100644
index 00000000000..b8bd61cf35f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mx.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mx.png
new file mode 100644
index 00000000000..7bc656cb7e4
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mx.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_my.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_my.png
new file mode 100644
index 00000000000..50bc61d822c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_my.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_mz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mz.png
new file mode 100644
index 00000000000..5b677a8d1a8
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_mz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_na.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_na.png
new file mode 100644
index 00000000000..879cbdf44f8
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_na.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_nc.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nc.png
new file mode 100644
index 00000000000..1f53a6a9c48
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nc.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ne.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ne.png
new file mode 100644
index 00000000000..c77a3436978
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ne.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_nf.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nf.png
new file mode 100644
index 00000000000..96f35b01621
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nf.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ng.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ng.png
new file mode 100644
index 00000000000..8c175ed6cc6
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ng.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ni.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ni.png
new file mode 100644
index 00000000000..bebf90a01f8
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ni.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_nl.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nl.png
new file mode 100644
index 00000000000..f1eece1db13
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nl.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_no.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_no.png
new file mode 100644
index 00000000000..e5102023a76
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_no.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_np.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_np.png
new file mode 100644
index 00000000000..bbfef28bcd4
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_np.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_nr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nr.png
new file mode 100644
index 00000000000..8c1529ddaa5
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_nu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nu.png
new file mode 100644
index 00000000000..17e42beb908
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_nz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nz.png
new file mode 100644
index 00000000000..93e9267c77d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_nz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_om.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_om.png
new file mode 100644
index 00000000000..277a288f62b
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_om.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pa.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pa.png
new file mode 100644
index 00000000000..b1e97f8849d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pa.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pe.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pe.png
new file mode 100644
index 00000000000..48c1203717b
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pe.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pf.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pf.png
new file mode 100644
index 00000000000..40e5210926c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pf.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pg.png
new file mode 100644
index 00000000000..98b81b1de41
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ph.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ph.png
new file mode 100644
index 00000000000..63c97db1062
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ph.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pk.png
new file mode 100644
index 00000000000..dddac0aa26b
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pl.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pl.png
new file mode 100644
index 00000000000..f29c716820d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pl.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pn.png
new file mode 100644
index 00000000000..ecc46daea86
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pr.png
new file mode 100644
index 00000000000..42796fe8fdb
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ps.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ps.png
new file mode 100644
index 00000000000..b7cbe1c3492
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ps.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pt.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pt.png
new file mode 100644
index 00000000000..abdbf31ff76
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pt.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_pw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pw.png
new file mode 100644
index 00000000000..ff3988638ff
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_pw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_py.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_py.png
new file mode 100644
index 00000000000..04f5d9a9823
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_py.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_qa.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_qa.png
new file mode 100644
index 00000000000..3bf92193bab
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_qa.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ro.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ro.png
new file mode 100644
index 00000000000..5968cb16cd0
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ro.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_rs.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_rs.png
new file mode 100644
index 00000000000..7b3c8237f7c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_rs.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ru.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ru.png
new file mode 100644
index 00000000000..e87d75884c8
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ru.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_rw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_rw.png
new file mode 100644
index 00000000000..4898fcc9e59
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_rw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sa.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sa.png
new file mode 100644
index 00000000000..87c67b09dcf
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sa.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sb.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sb.png
new file mode 100644
index 00000000000..43b9068c71c
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sb.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sc.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sc.png
new file mode 100644
index 00000000000..f3d60e93e77
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sc.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sd.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sd.png
new file mode 100644
index 00000000000..6d364dee75e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sd.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_se.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_se.png
new file mode 100644
index 00000000000..3dbe1ec417d
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_se.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sg.png
new file mode 100644
index 00000000000..27e950c900e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sh.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sh.png
new file mode 100644
index 00000000000..dd89323ea85
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sh.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_si.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_si.png
new file mode 100644
index 00000000000..2a52b542688
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_si.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sk.png
new file mode 100644
index 00000000000..a1540e17b60
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sl.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sl.png
new file mode 100644
index 00000000000..d36d704c929
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sl.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sm.png
new file mode 100644
index 00000000000..944ba860ce3
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sn.png
new file mode 100644
index 00000000000..7c90de1ab75
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_so.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_so.png
new file mode 100644
index 00000000000..a3f52cf9a65
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_so.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sr.png
new file mode 100644
index 00000000000..973655f0712
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ss.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ss.png
new file mode 100644
index 00000000000..15ff92b4706
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ss.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_st.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_st.png
new file mode 100644
index 00000000000..c5952d39e77
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_st.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sv.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sv.png
new file mode 100644
index 00000000000..36c9f03ca56
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sv.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sy.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sy.png
new file mode 100644
index 00000000000..897c6b3e626
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sy.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_sz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sz.png
new file mode 100644
index 00000000000..7889710a119
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_sz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tc.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tc.png
new file mode 100644
index 00000000000..5b794ec4e61
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tc.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_td.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_td.png
new file mode 100644
index 00000000000..214cb0dde89
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_td.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tf.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tf.png
new file mode 100644
index 00000000000..17bd6c39323
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tf.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tg.png
new file mode 100644
index 00000000000..66eae0f1623
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_th.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_th.png
new file mode 100644
index 00000000000..eb652f28030
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_th.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tj.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tj.png
new file mode 100644
index 00000000000..7591f28c45b
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tj.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tk.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tk.png
new file mode 100644
index 00000000000..e8b3855a1b7
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tk.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tl.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tl.png
new file mode 100644
index 00000000000..b7db4ebd02f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tl.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tm.png
new file mode 100644
index 00000000000..9d82abc926b
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tn.png
new file mode 100644
index 00000000000..92ec1ef18d8
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_to.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_to.png
new file mode 100644
index 00000000000..e1d96b3a7dd
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_to.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tr.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tr.png
new file mode 100644
index 00000000000..838049d0e65
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tr.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tt.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tt.png
new file mode 100644
index 00000000000..ca612a660bb
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tt.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tv.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tv.png
new file mode 100644
index 00000000000..94839b18b1a
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tv.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tw.png
new file mode 100644
index 00000000000..044f0fadfdf
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_tz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tz.png
new file mode 100644
index 00000000000..e034a044b87
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_tz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ua.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ua.png
new file mode 100644
index 00000000000..115de4bdf9e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ua.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ug.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ug.png
new file mode 100644
index 00000000000..5a6be882a01
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ug.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_us.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_us.png
new file mode 100644
index 00000000000..57f3cbe6545
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_us.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_uy.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_uy.png
new file mode 100644
index 00000000000..1cae6429219
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_uy.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_uz.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_uz.png
new file mode 100644
index 00000000000..a29cd4e10ff
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_uz.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_va.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_va.png
new file mode 100644
index 00000000000..1fd41bc7d9b
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_va.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_vc.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vc.png
new file mode 100644
index 00000000000..28aad72a6da
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vc.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ve.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ve.png
new file mode 100644
index 00000000000..82818894dab
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ve.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_vg.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vg.png
new file mode 100644
index 00000000000..470335ec9aa
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vg.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_vi.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vi.png
new file mode 100644
index 00000000000..733e515902e
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vi.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_vn.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vn.png
new file mode 100644
index 00000000000..4a715d74378
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vn.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_vu.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vu.png
new file mode 100644
index 00000000000..10591b5d111
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_vu.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_wf.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_wf.png
new file mode 100644
index 00000000000..0c47a29eb25
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_wf.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ws.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ws.png
new file mode 100644
index 00000000000..3942e2041fa
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ws.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_ye.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ye.png
new file mode 100644
index 00000000000..20c417acc89
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_ye.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_yt.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_yt.png
new file mode 100644
index 00000000000..1ea71d448f9
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_yt.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_za.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_za.png
new file mode 100644
index 00000000000..c426db698a2
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_za.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_zm.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_zm.png
new file mode 100644
index 00000000000..8c876c6574f
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_zm.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/drawable/flag_zw.png b/mobile/com.sap.sailing.android.shared/res/drawable/flag_zw.png
new file mode 100644
index 00000000000..47e8aa74e58
Binary files /dev/null and b/mobile/com.sap.sailing.android.shared/res/drawable/flag_zw.png differ
diff --git a/mobile/com.sap.sailing.android.shared/res/layout/system_information_view.xml b/mobile/com.sap.sailing.android.shared/res/layout/system_information_view.xml
index e1f5b9e71e7..382a5776390 100644
--- a/mobile/com.sap.sailing.android.shared/res/layout/system_information_view.xml
+++ b/mobile/com.sap.sailing.android.shared/res/layout/system_information_view.xml
@@ -1,98 +1,113 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/menu/options_menu_live_status.xml b/mobile/com.sap.sailing.android.shared/res/menu/options_menu_live_status.xml
index cdaf98ab9da..377394928b1 100644
--- a/mobile/com.sap.sailing.android.shared/res/menu/options_menu_live_status.xml
+++ b/mobile/com.sap.sailing.android.shared/res/menu/options_menu_live_status.xml
@@ -8,4 +8,4 @@
android:title="@string/options_menu_live"
app:showAsAction="ifRoom"/>
-
+
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/values/strings.xml b/mobile/com.sap.sailing.android.shared/res/values/strings.xml
index f3ddeecaf2f..f2709c87481 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/strings.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/strings.xml
@@ -10,6 +10,7 @@
Application InformationIdentifier
+ Build InformationInstall DatePersistence StatusClear events
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java
index 55320b838ca..68ba2be2597 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpGetRequest.java
@@ -18,8 +18,6 @@ public class HttpGetRequest extends HttpRequest {
super(url, listener, context);
}
-
-
@Override
protected BufferedInputStream doRequest(HttpURLConnection connection) throws IOException {
InputStream stream = connection.getInputStream();
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonGetRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonGetRequest.java
new file mode 100644
index 00000000000..78607cd9240
--- /dev/null
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonGetRequest.java
@@ -0,0 +1,31 @@
+package com.sap.sailing.android.shared.data.http;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import android.content.Context;
+
+public class HttpJsonGetRequest extends HttpRequest {
+ public final static String ContentType = "application/json;charset=UTF-8";
+
+ public HttpJsonGetRequest(URL requestUrl, Context context) {
+ super(requestUrl, context);
+ }
+
+ @Override
+ protected BufferedInputStream doRequest(HttpURLConnection connection) throws IOException {
+// connection.setDoOutput(true);
+ connection.setRequestMethod("GET");
+ connection.setChunkedStreamingMode(0);
+
+ connection.setRequestProperty("Content-Type", ContentType);
+ connection.setRequestProperty("Accept", ContentType);
+
+// OutputStream outputStream = new BufferedOutputStream(connection.getOutputStream());
+// outputStream.close();
+
+ return new BufferedInputStream(connection.getInputStream());
+ }
+}
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java
index 831f4121223..96f5a7a0ccc 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpJsonPostRequest.java
@@ -26,6 +26,7 @@ public class HttpJsonPostRequest extends HttpRequest {
@Override
protected BufferedInputStream doRequest(HttpURLConnection connection) throws IOException {
+ connection.setRequestMethod("POST");
connection.setDoOutput(true);
connection.setChunkedStreamingMode(0);
@@ -44,4 +45,8 @@ public class HttpJsonPostRequest extends HttpRequest {
outputStream.write(requestBody.getBytes(Charset.forName("UTF-8")));
}
}
+
+ public String getRequestBody() {
+ return requestBody;
+ }
}
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java
index 3ee868a7a8a..87c0d4d2f34 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/data/http/HttpRequest.java
@@ -10,8 +10,6 @@ import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
-import org.apache.http.HttpStatus;
-
import android.content.Context;
import com.sap.sailing.android.shared.logging.ExLog;
@@ -20,8 +18,8 @@ public abstract class HttpRequest {
private final static String TAG = HttpRequest.class.getName();
- private final static int lowestOkCode = HttpStatus.SC_OK;
- private final static int lowestRedirectCode = HttpStatus.SC_MULTIPLE_CHOICES;
+ private final static int lowestOkCode = HttpURLConnection.HTTP_OK;
+ private final static int lowestRedirectCode = HttpURLConnection.HTTP_MULT_CHOICE;
private static void validateHttpResponseCode(HttpURLConnection connection) throws IOException {
int statusCode = connection.getResponseCode();
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/logging/ExLog.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/logging/ExLog.java
index 1023948a046..5f2c219d65b 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/logging/ExLog.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/logging/ExLog.java
@@ -1,5 +1,10 @@
package com.sap.sailing.android.shared.logging;
+import android.content.Context;
+import android.provider.Settings.Secure;
+import android.text.TextUtils;
+import android.util.Log;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Date;
@@ -7,20 +12,16 @@ import java.util.EnumSet;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
-import android.content.Context;
-import android.provider.Settings.Secure;
-import android.util.Log;
-
/**
* Simple wrapper for logging to various targets.
- *
+ *
* Log by using {@link ExLog#i(String, String)}, {@link ExLog#w(String, String)} and {@link ExLog#e(String, String)}.
* Activate a set of targets by using {@link ExLog#activate(Target)} or {@link ExLog#activate(EnumSet)}. Currently
* available are logging to android.util.Log LogCat and logging to a file on SD-card.
- *
+ *
* The file logging in very defensive in a way that opening and writing to the file is secured by various exception
* handlers trying to silence all possible errors.
- *
+ *
*/
public class ExLog {
private final static String TAG = "ExLogInternal";
@@ -63,7 +64,7 @@ public class ExLog {
public synchronized static void e(Context context, String tag, String msg) {
getInstance().error(context, tag, msg);
}
-
+
public synchronized static void ex(Context context, String tag, Exception e) {
getInstance().exception(context, tag, e);
}
@@ -97,35 +98,48 @@ public class ExLog {
}
private void info(Context context, String tag, String msg) {
- if (isTargetActive(Target.LOGCAT))
+ msg = (msg == null) ? "" : msg;
+ if (isTargetActive(Target.LOGCAT)) {
Log.i(tag, msg);
+ }
- if (isTargetActive(Target.FILE))
+ if (isTargetActive(Target.FILE)) {
logToFile(context, LogLevel.INFORMATION, tag, msg);
+ }
}
private void warning(Context context, String tag, String msg) {
- if (isTargetActive(Target.LOGCAT))
- Log.w(tag, msg);
+ msg = (msg == null) ? "" : msg;
+ if (!TextUtils.isEmpty(msg)) {
+ if (isTargetActive(Target.LOGCAT)) {
+ Log.w(tag, msg);
+ }
- if (isTargetActive(Target.FILE))
- logToFile(context, LogLevel.WARNING, tag, msg);
+ if (isTargetActive(Target.FILE)) {
+ logToFile(context, LogLevel.WARNING, tag, msg);
+ }
+ }
}
private void error(Context context, String tag, String msg) {
- if (isTargetActive(Target.LOGCAT))
- Log.e(tag, msg);
+ msg = (msg == null) ? "" : msg;
+ if (!TextUtils.isEmpty(msg)) {
+ if (isTargetActive(Target.LOGCAT)) {
+ Log.e(tag, msg);
+ }
- if (isTargetActive(Target.FILE))
- logToFile(context, LogLevel.ERROR, tag, msg);
+ if (isTargetActive(Target.FILE)) {
+ logToFile(context, LogLevel.ERROR, tag, msg);
+ }
+ }
}
-
+
private void exception(Context context, String tag, Exception e) {
StringWriter stringWriter = new StringWriter();
PrintWriter stream = new PrintWriter(stringWriter);
e.printStackTrace(stream);
String msg = stringWriter.toString();
-
+
if (isTargetActive(Target.LOGCAT))
Log.e(tag, msg);
@@ -150,8 +164,9 @@ public class ExLog {
}
private void initializeFileLoggingTask(Context context) {
- if (fileLoggingTaskInitialized)
+ if (fileLoggingTaskInitialized) {
return;
+ }
fileLoggingTaskInitialized = true;
logBuffer = new ArrayBlockingQueue(LogBufferCapacity);
@@ -164,5 +179,4 @@ public class ExLog {
Log.w(TAG, "Logging to file couldn't be enabled.");
}
}
-
}
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java
index 679bcadbeb3..6149f56cc02 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java
@@ -10,7 +10,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
-
import com.sap.sailing.android.shared.logging.ExLog;
/**
@@ -37,8 +36,8 @@ public class ConnectivityChangedReceiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
ConnectivityManager cService = (ConnectivityManager)
context.getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo networkInfo = (NetworkInfo) cService.getActiveNetworkInfo();
- if (!networkInfo.isConnected())
+ NetworkInfo networkInfo = cService.getActiveNetworkInfo();
+ if (networkInfo == null || !networkInfo.isConnected())
return;
context.startService(MessageSendingService.createSendDelayedIntent(context));
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java
index 6e2e5b52f6b..deea1ae4272 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/MessageSenderTask.java
@@ -68,5 +68,4 @@ public class MessageSenderTask extends AsyncTask callbackClass) {
Intent messageIntent = new Intent(context, MessageSendingService.class);
messageIntent.setAction(context.getString(R.string.intent_send_message));
@@ -270,7 +265,7 @@ public class MessageSendingService extends Service implements MessageSendingList
private void sendMessage(Intent intent) {
boolean sendingActive = PrefUtils.getBoolean(this, R.string.preference_isSendingActive_key,
R.bool.preference_isSendingActive_default);
- if (! sendingActive) {
+ if (!sendingActive) {
ExLog.i(this, TAG, "Sending deactivated. Message will not be sent to server.");
} else {
Serializable messageId = getMessageId(intent);
@@ -365,7 +360,8 @@ public class MessageSendingService extends Service implements MessageSendingList
RaceLogServletConstants.PARAMS_CLIENT_UUID+"=%s",
PrefUtils.getString(context, R.string.preference_server_url_key, R.string.preference_server_url_default),
URLEncoder.encode(raceGroupName, charsetName),
- URLEncoder.encode(raceName, charsetName), URLEncoder.encode(fleetName, charsetName), uuid);
+ URLEncoder.encode(raceName, charsetName),
+ URLEncoder.encode(fleetName, charsetName), uuid);
return url;
}
@@ -433,4 +429,14 @@ public class MessageSendingService extends Service implements MessageSendingList
apiConnectivityListener.setUnsentGPSFixesCount(getDelayedIntentsCount());
}
}
+
+ public static String getRacePositionsUrl(Context context, final String regattaName, final String raceName)
+ throws UnsupportedEncodingException {
+ String url = String
+ .format("%s/sailingserver/api/v1/regattas/%s/races/%s/marks/positions",
+ PrefUtils.getString(context, R.string.preference_server_url_key,
+ R.string.preference_server_url_default), URLEncoder.encode(regattaName, charsetName)
+ .replace("+", "%20"), URLEncoder.encode(raceName, charsetName.replace("+", "%20")));// ,
+ return url;
+ }
}
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/LoggableActivity.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/LoggableActivity.java
index df577baeb13..b3a6cf3c0ff 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/LoggableActivity.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/LoggableActivity.java
@@ -1,12 +1,12 @@
package com.sap.sailing.android.shared.ui.activities;
import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.ActionBarActivity;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.android.shared.logging.LifecycleLogger;
-public abstract class LoggableActivity extends ActionBarActivity {
+public abstract class LoggableActivity extends AppCompatActivity {
private static final String TAG = LoggableActivity.class.getName();
private LifecycleLogger lifeLogger;
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/BasePreferenceFragment.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/BasePreferenceFragment.java
index d66fbd58fff..2204a0e282e 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/BasePreferenceFragment.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/fragments/preference/BasePreferenceFragment.java
@@ -90,7 +90,27 @@ public class BasePreferenceFragment extends PreferenceFragment {
}
});
}
-
+
+ protected static void bindPreferenceToListEntry(Preference preference, final String defaultValue) {
+ final ListPreference listPreference = (ListPreference) preference;
+ if (listPreference.getValue() == null) {
+ listPreference.setValue(defaultValue);
+ }
+ listPreference.setSummary(listPreference.getEntry());
+ addOnPreferenceChangeListener(preference, new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference pref, Object newValue) {
+ int index = listPreference.findIndexOfValue(String.valueOf(newValue));
+ if (index < 0) {
+ index = listPreference.findIndexOfValue(defaultValue);
+ }
+ String summary = listPreference.getEntries()[index].toString();
+ pref.setSummary(summary);
+ return true;
+ }
+ });
+ }
+
protected static void addOnPreferenceChangeListener(Preference preference, OnPreferenceChangeListener newListener) {
OnPreferenceChangeListener oldListener = preference.getOnPreferenceChangeListener();
if (oldListener == null) {
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/.classpath b/mobile/com.sap.sailing.android.tracking.app.test-test/.classpath
new file mode 100644
index 00000000000..f895a38f5f3
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/.classpath
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/.project b/mobile/com.sap.sailing.android.tracking.app.test-test/.project
new file mode 100644
index 00000000000..fb93d637769
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/.project
@@ -0,0 +1,34 @@
+
+
+ com.sap.sailing.android.tracking.app.test
+
+
+ com.sap.sailing.android.tracking.app
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/.settings/org.eclipse.jdt.core.prefs b/mobile/com.sap.sailing.android.tracking.app.test-test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..b080d2ddc88
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/AndroidManifest.xml b/mobile/com.sap.sailing.android.tracking.app.test-test/AndroidManifest.xml
new file mode 100644
index 00000000000..511827676b5
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/AndroidManifest.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/libs/dexmaker-1.0.jar b/mobile/com.sap.sailing.android.tracking.app.test-test/libs/dexmaker-1.0.jar
new file mode 100644
index 00000000000..ea2b6601434
Binary files /dev/null and b/mobile/com.sap.sailing.android.tracking.app.test-test/libs/dexmaker-1.0.jar differ
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/libs/dexmaker-mockito-1.0.jar b/mobile/com.sap.sailing.android.tracking.app.test-test/libs/dexmaker-mockito-1.0.jar
new file mode 100644
index 00000000000..22c776eb5ea
Binary files /dev/null and b/mobile/com.sap.sailing.android.tracking.app.test-test/libs/dexmaker-mockito-1.0.jar differ
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/libs/mockito-all-1.9.5.jar b/mobile/com.sap.sailing.android.tracking.app.test-test/libs/mockito-all-1.9.5.jar
new file mode 100644
index 00000000000..00416eb3877
Binary files /dev/null and b/mobile/com.sap.sailing.android.tracking.app.test-test/libs/mockito-all-1.9.5.jar differ
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/proguard-project.txt b/mobile/com.sap.sailing.android.tracking.app.test-test/proguard-project.txt
new file mode 100644
index 00000000000..f2fe1559a21
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/project.properties b/mobile/com.sap.sailing.android.tracking.app.test-test/project.properties
new file mode 100644
index 00000000000..c4d7cfd6e7c
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=Google Inc.:Google APIs:22
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-hdpi/ic_launcher.png b/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000000..96a442e5b8e
Binary files /dev/null and b/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-hdpi/ic_launcher.png differ
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/drawable-ldpi/ic_launcher.png b/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from mobile/com.sap.sailing.racecommittee.app/res/drawable-ldpi/ic_launcher.png
rename to mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-ldpi/ic_launcher.png
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-mdpi/ic_launcher.png b/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000000..359047dfa4e
Binary files /dev/null and b/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-mdpi/ic_launcher.png differ
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-xhdpi/ic_launcher.png b/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000000..71c6d760f05
Binary files /dev/null and b/mobile/com.sap.sailing.android.tracking.app.test-test/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app.test-test/res/values/strings.xml
new file mode 100644
index 00000000000..8c405e56633
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/res/values/strings.xml
@@ -0,0 +1,6 @@
+
+
+
+ Com.sap.sailing.android.tracking.app.testTest
+
+
diff --git a/mobile/com.sap.sailing.android.tracking.app.test-test/src/com/sap/sailing/android/tracking/app/test/ActivityUnitTestCase.java b/mobile/com.sap.sailing.android.tracking.app.test-test/src/com/sap/sailing/android/tracking/app/test/ActivityUnitTestCase.java
new file mode 100644
index 00000000000..ec40cee60cf
--- /dev/null
+++ b/mobile/com.sap.sailing.android.tracking.app.test-test/src/com/sap/sailing/android/tracking/app/test/ActivityUnitTestCase.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.sap.sailing.android.tracking.app.test;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.test.ActivityInstrumentationTestCase;
+import android.test.ActivityTestCase;
+import android.test.mock.MockApplication;
+import android.view.Window;
+
+/**
+ * This class provides isolated testing of a single activity. The activity under test will
+ * be created with minimal connection to the system infrastructure, and you can inject mocked or
+ * wrappered versions of many of Activity's dependencies. Most of the work is handled
+ * automatically here by {@link #setUp} and {@link #tearDown}.
+ *
+ *
If you prefer a functional test, see {@link android.test.ActivityInstrumentationTestCase}.
+ *
+ *
It must be noted that, as a true unit test, your Activity will not be running in the
+ * normal system and will not participate in the normal interactions with other Activities.
+ * The following methods should not be called in this configuration - most of them will throw
+ * exceptions:
+ *
The following methods may be called but will not do anything. For test purposes, you can use
+ * the methods {@link #getStartedActivityIntent()} and {@link #getStartedActivityRequest()} to
+ * inspect the parameters that they were called with.
+ *
The following methods may be called but will not do anything. For test purposes, you can use
+ * the methods {@link #isFinishCalled()} and {@link #getFinishedActivityRequest()} to inspect the
+ * parameters that they were called with.
+ *
+ *
+ */
+public abstract class ActivityUnitTestCase
+ extends ActivityTestCase {
+
+ private Class mActivityClass;
+
+ private Context mActivityContext;
+ private Application mApplication;
+ private MockParent mMockParent;
+
+ private boolean mAttached = false;
+ private boolean mCreated = false;
+
+ public ActivityUnitTestCase(Class activityClass) {
+ mActivityClass = activityClass;
+ }
+
+ @Override
+ public T getActivity() {
+ return (T) super.getActivity();
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // default value for target context, as a default
+ mActivityContext = getInstrumentation().getTargetContext();
+ }
+
+ /**
+ * Start the activity under test, in the same way as if it was started by
+ * {@link android.content.Context#startActivity Context.startActivity()}, providing the
+ * arguments it supplied. When you use this method to start the activity, it will automatically
+ * be stopped by {@link #tearDown}.
+ *
+ *
This method will call onCreate(), but if you wish to further exercise Activity life
+ * cycle methods, you must call them yourself from your test case.
+ *
+ *
Do not call from your setUp() method. You must call this method from each of your
+ * test methods.
+ *
+ * @param intent The Intent as if supplied to {@link android.content.Context#startActivity}.
+ * @param savedInstanceState The instance state, if you are simulating this part of the life
+ * cycle. Typically null.
+ * @param lastNonConfigurationInstance This Object will be available to the
+ * Activity if it calls {@link android.app.Activity#getLastNonConfigurationInstance()}.
+ * Typically null.
+ * @return Returns the Activity that was created
+ */
+ protected T startActivity(Intent intent, Bundle savedInstanceState,
+ Object lastNonConfigurationInstance) {
+ assertFalse("Activity already created", mCreated);
+
+ if (!mAttached) {
+ assertNotNull(mActivityClass);
+ setActivity(null);
+ T newActivity = null;
+ try {
+ IBinder token = null;
+ if (mApplication == null) {
+ setApplication(new MockApplication());
+ }
+// ComponentName cn = new ComponentName(mActivityClass.getPackage().getName(),
+// mActivityClass.getName());
+ ComponentName cn = new ComponentName(getInstrumentation().getTargetContext(), mActivityClass);
+ intent.setComponent(cn);
+ ActivityInfo info = new ActivityInfo();
+ CharSequence title = mActivityClass.getName();
+ mMockParent = new MockParent();
+ String id = null;
+
+ newActivity = (T) getInstrumentation().newActivity(mActivityClass, mActivityContext,
+ token, mApplication, intent, info, title, mMockParent, id,
+ lastNonConfigurationInstance);
+ } catch (Exception e) {
+ assertNotNull(newActivity);
+ }
+
+ assertNotNull(newActivity);
+ setActivity(newActivity);
+
+ mAttached = true;
+ }
+
+ T result = getActivity();
+ if (result != null) {
+ getInstrumentation().callActivityOnCreate(getActivity(), savedInstanceState);
+ mCreated = true;
+ }
+ return result;
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+
+ setActivity(null);
+
+ // Scrub out members - protects against memory leaks in the case where someone
+ // creates a non-static inner class (thus referencing the test case) and gives it to
+ // someone else to hold onto
+ scrubClass(ActivityInstrumentationTestCase.class);
+
+ super.tearDown();
+ }
+
+ /**
+ * Set the application for use during the test. You must call this function before calling
+ * {@link #startActivity}. If your test does not call this method,
+ * @param application The Application object that will be injected into the Activity under test.
+ */
+ public void setApplication(Application application) {
+ mApplication = application;
+ }
+
+ /**
+ * If you wish to inject a Mock, Isolated, or otherwise altered context, you can do so
+ * here. You must call this function before calling {@link #startActivity}. If you wish to
+ * obtain a real Context, as a building block, use getInstrumentation().getTargetContext().
+ */
+ public void setActivityContext(Context activityContext) {
+ mActivityContext = activityContext;
+ }
+
+ /**
+ * This method will return the value if your Activity under test calls
+ * {@link android.app.Activity#setRequestedOrientation}.
+ */
+ public int getRequestedOrientation() {
+ if (mMockParent != null) {
+ return mMockParent.mRequestedOrientation;
+ }
+ return 0;
+ }
+
+ /**
+ * This method will return the launch intent if your Activity under test calls
+ * {@link android.app.Activity#startActivity(Intent)} or
+ * {@link android.app.Activity#startActivityForResult(Intent, int)}.
+ * @return The Intent provided in the start call, or null if no start call was made.
+ */
+ public Intent getStartedActivityIntent() {
+ if (mMockParent != null) {
+ return mMockParent.mStartedActivityIntent;
+ }
+ return null;
+ }
+
+ /**
+ * This method will return the launch request code if your Activity under test calls
+ * {@link android.app.Activity#startActivityForResult(Intent, int)}.
+ * @return The request code provided in the start call, or -1 if no start call was made.
+ */
+ public int getStartedActivityRequest() {
+ if (mMockParent != null) {
+ return mMockParent.mStartedActivityRequest;
+ }
+ return 0;
+ }
+
+ /**
+ * This method will notify you if the Activity under test called
+ * {@link android.app.Activity#finish()},
+ * {@link android.app.Activity#finishFromChild(Activity)}, or
+ * {@link android.app.Activity#finishActivity(int)}.
+ * @return Returns true if one of the listed finish methods was called.
+ */
+ public boolean isFinishCalled() {
+ if (mMockParent != null) {
+ return mMockParent.mFinished;
+ }
+ return false;
+ }
+
+ /**
+ * This method will return the request code if the Activity under test called
+ * {@link android.app.Activity#finishActivity(int)}.
+ * @return The request code provided in the start call, or -1 if no finish call was made.
+ */
+ public int getFinishedActivityRequest() {
+ if (mMockParent != null) {
+ return mMockParent.mFinishedActivityRequest;
+ }
+ return 0;
+ }
+
+ /**
+ * This mock Activity represents the "parent" activity. By injecting this, we allow the user
+ * to call a few more Activity methods, including:
+ *
+ *
+ * TODO: Make this overrideable, and the unit test can look for calls to other methods
+ */
+ private static class MockParent extends Activity {
+
+ public int mRequestedOrientation = 0;
+ public Intent mStartedActivityIntent = null;
+ public int mStartedActivityRequest = -1;
+ public boolean mFinished = false;
+ public int mFinishedActivityRequest = -1;
+
+ /**
+ * Implementing in the parent allows the user to call this function on the tested activity.
+ */
+ @Override
+ public void setRequestedOrientation(int requestedOrientation) {
+ mRequestedOrientation = requestedOrientation;
+ }
+
+ /**
+ * Implementing in the parent allows the user to call this function on the tested activity.
+ */
+ @Override
+ public int getRequestedOrientation() {
+ return mRequestedOrientation;
+ }
+
+ /**
+ * By returning null here, we inhibit the creation of any "container" for the window.
+ */
+ @Override
+ public Window getWindow() {
+ return null;
+ }
+
+ /**
+ * By defining this in the parent, we allow the tested activity to call
+ *
+ */
+ @Override
+ public void startActivityFromChild(Activity child, Intent intent, int requestCode) {
+ mStartedActivityIntent = intent;
+ mStartedActivityRequest = requestCode;
+ }
+
+ /**
+ * By defining this in the parent, we allow the tested activity to call
+ *
+ */
+ @Override
+ public void finishFromChild(Activity child) {
+ mFinished = true;
+ }
+
+ /**
+ * By defining this in the parent, we allow the tested activity to call
+ *