What's New - SAP Sailing Race Manager
+
March 2016
+ +-
+
- Added sign in/sign out into the app. The user has to be create in the backend, with leaderboard + permission. Without the permission, the user can't send data to the server. +
- We changed the QR Code, so it includes the user's access token. There is also a possibility to manual login into + the app, if no QR Code is available. The app doesn't store username and password. +
- The behavior of the red share icon has also slightly changed. If it is red and tapped, it will call the server + to check, if the users access token is still valid. If not the server response with a 401 error code and the user + has to enter his credentials. +
- You can force a user sign out within the overflow menu, if you need other user credentials. +
February 2016
-
diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarksJsonExportServlet.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarksJsonExportServlet.java
index efcb71cc9f5..31bbdacf101 100644
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarksJsonExportServlet.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/MarksJsonExportServlet.java
@@ -1,7 +1,6 @@
package com.sap.sailing.server.gateway.impl.rc;
import java.io.IOException;
-import java.util.UUID;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -58,22 +57,12 @@ public class MarksJsonExportServlet extends AbstractJsonHttpServlet {
return;
}
JSONArray result = new JSONArray();
- final Iterable marks = raceColumn.getMarks(fleet);
+ final Iterable marks = raceColumn.getAvailableMarks(fleet);
MarkJsonSerializer serializer = new MarkJsonSerializer();
for (Mark mark : marks) {
- if (toUUID(mark.getId().toString()) != null) {
- result.add(serializer.serialize(mark));
- }
+ result.add(serializer.serialize(mark));
}
setJsonResponseHeader(response);
result.writeJSONString(response.getWriter());
}
-
- private UUID toUUID(String value) {
- try {
- return UUID.fromString(value);
- } catch (IllegalArgumentException iae) {
- return null;
- }
- }
}
diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
index ff04315885c..a72a3ab2d0a 100644
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
@@ -539,7 +539,7 @@ public class LeaderboardsResource extends AbstractSailingServerResource {
.type(MediaType.TEXT_PLAIN).build();
} else {
for (RaceColumn raceColumn : leaderboard.getRaceColumns()) {
- Util.addAll(raceColumn.getAllMarks(), marks);
+ Util.addAll(raceColumn.getCourseMarks(), marks);
}
}
} else {
@@ -558,13 +558,13 @@ public class LeaderboardsResource extends AbstractSailingServerResource {
StringEscapeUtils.escapeHtml(leaderboardName)
+ "'.").type(MediaType.TEXT_PLAIN).build();
} else {
- Util.addAll(raceColumn.getMarks(fleet), marks);
+ Util.addAll(raceColumn.getCourseMarks(fleet), marks);
}
} else {
// Return all marks for a certain race column
// if all races have a tracked race return all marks part of at least one tracked race
// if at least one race doesn't have a tracked race, return also the marks defined in the RegattaLog
- Util.addAll(raceColumn.getAllMarks(), marks);
+ Util.addAll(raceColumn.getCourseMarks(), marks);
}
}
JSONArray array = new JSONArray();
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch b/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
index 70d5da234a1..64d68838215 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy OSX).launch
@@ -1,38 +1,38 @@
-
-
- Add {@code manifest="YOURMODULENAME/appcache.manifest"} to the {@code } tag in your base html file. + *
- Subclass {@link ManifestLinker} and override the method {@link #staticCachedFiles()}. + *
- Define a mime type mapping for the
manifestextension in your web.xml file. + *+ * {@code+ *+ * + * }manifest + *text/cache-manifest + *
+ * - Define the subclassed linker in your gwt.xml file and add the linker. + *
- Make sure to import the those packages into your MANIFEST.MF file. + * com.google.gwt.core.ext + * com.google.gwt.core.ext.linker + * com.google.gwt.core.ext.linker.impl + *
- + + +
- + + +
- + + +
- +
- + +
- \ No newline at end of file diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml index 8506c5ad3be..11475c2c3df 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml @@ -174,8 +174,10 @@
- @layout/flag_list_item_xlarge
- @layout/login_backdrop_xlarge
- @layout/login_listviews_button_xlarge -
- @layout/login_onboarding_scan_xlarge -
- @layout/login_onboarding_input_xlarge
- @layout/photo_list_button_xlarge
- @layout/photo_list_item_xlarge
- @layout/race_finishing_button_xlarge diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-v21/dimen.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-v21/dimen.xml new file mode 100644 index 00000000000..74c0477fe23 --- /dev/null +++ b/mobile/com.sap.sailing.racecommittee.app/res/values-v21/dimen.xml @@ -0,0 +1,6 @@ + +
- @layout/flag_list_item_normal
- @layout/login_backdrop_normal
- @layout/login_listviews_button_normal -
- @layout/login_onboarding_scan_normal -
- @layout/login_onboarding_input_normal
- @layout/photo_list_button_normal
- @layout/photo_list_item_normal
- @layout/race_finished_normal diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml index 6c2e499a2a0..c13f9cca623 100644 --- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml @@ -185,8 +185,10 @@
- @style/AppTheme.Dark.Button.Small
- @style/AppTheme.Dark.Button.Normal
- @style/AppTheme.Dark.Round +
- @style/AppTheme.Dark.RoundTransparent
- @style/AppTheme.Dark.Text
- @style/AppTheme.Dark.Text.XXSmall
- @style/AppTheme.Dark.Text.XSmall @@ -123,6 +124,11 @@
- @dimen/logout_padding + + + +
-
+ *
+ * {@code
+ * - * + * * Use in the following way: Add the service declaration to your {@code AndroidManifest.xml}, * and also specify your class implementing the {@link MessagePersistenceManager.MessageRestorer} * as a meta-data tag with the key {@code com.sap.sailing.android.shared.services.sending.messageRestorer}. @@ -42,9 +42,9 @@ import java.util.*; * android:value="com.sap.sailing.racecommittee.app.services.sending.EventRestorer" /> * * } - * - * - * Message sending example: + * + * + * Message sending example: *
{@code
* context.startService(MessageSendingService.createMessageIntent(
* context, url, race.getId(), eventId, serializedEventAsJson, callbackClass));
@@ -56,7 +56,7 @@ public class MessageSendingService extends Service implements MessageSendingList
public final static String CALLBACK_CLASS = "callback";
public final static String CALLBACK_PAYLOAD = "callbackPayload"; // passed back to callback
public final static String MESSAGE_ID = "messageId";
-
+
public static final String charsetName = "UTF-8";
protected final static String TAG = MessageSendingService.class.getName();
@@ -66,7 +66,7 @@ public class MessageSendingService extends Service implements MessageSendingList
private final IBinder mBinder = new MessageSendingBinder();
private MessagePersistenceManager persistenceManager;
private boolean isHandlerSet;
-
+
private Set suppressedMessageIds = new HashSet();
private APIConnectivityListener apiConnectivityListener;
@@ -86,9 +86,9 @@ public class MessageSendingService extends Service implements MessageSendingList
};
public interface MessageSendingServiceLogger {
- public void onMessageSentSuccessful();
+ void onMessageSentSuccessful();
- public void onMessageSentFailed();
+ void onMessageSentFailed();
}
public void setMessageSendingServiceLogger(MessageSendingServiceLogger logger) {
@@ -107,7 +107,7 @@ public class MessageSendingService extends Service implements MessageSendingList
}
private Date lastSuccessfulSend;
-
+
public List getDelayedIntentsContent() {
return persistenceManager.getContent();
}
@@ -119,16 +119,16 @@ public class MessageSendingService extends Service implements MessageSendingList
public Date getLastSuccessfulSend() {
return lastSuccessfulSend;
}
-
+
public void clearDelayedIntents() {
persistenceManager.removeAllMessages();
// let's fake a successful send!
serviceLogger.onMessageSentSuccessful();
}
- public static Intent createMessageIntent(Context context, String url,
- Serializable callbackPayload, Serializable messageId, String payload,
- Class callbackClass) {
+ public static Intent createMessageIntent(Context context, String url,
+ Serializable callbackPayload, Serializable messageId, String payload,
+ Class callbackClass) {
Intent messageIntent = new Intent(context, MessageSendingService.class);
messageIntent.setAction(context.getString(R.string.intent_send_message));
messageIntent.putExtra(CALLBACK_PAYLOAD, callbackPayload);
@@ -138,7 +138,7 @@ public class MessageSendingService extends Service implements MessageSendingList
messageIntent.putExtra(CALLBACK_CLASS, callbackClass == null ? null : callbackClass.getName());
return messageIntent;
}
-
+
public static Intent createSendDelayedIntent(Context context) {
Intent intent = new Intent(context, MessageSendingService.class);
intent.setAction(context.getString(R.string.intent_send_saved_intents));
@@ -153,7 +153,7 @@ public class MessageSendingService extends Service implements MessageSendingList
ExLog.w(this, TAG, "Unable to extract message identifier from message intent.");
return null;
}
-
+
private MessagePersistenceManager getPersistenceManager() {
ComponentName thisService = new ComponentName(this, this.getClass());
MessageRestorer restorer = null;
@@ -172,7 +172,7 @@ public class MessageSendingService extends Service implements MessageSendingList
} else {
@SuppressWarnings("unchecked")
// checked above
- Class castedClass = (Class) clazz;
+ Class castedClass = (Class) clazz;
restorer = castedClass.getConstructor().newInstance();
}
}
@@ -223,9 +223,9 @@ public class MessageSendingService extends Service implements MessageSendingList
}
private void handleSendMessages(Intent intent) {
- ExLog.i(this, TAG, String.format("Trying to send a message..."));
+ ExLog.i(this, TAG, "Trying to send a message...");
if (!isConnected()) {
- ExLog.i(this, TAG, String.format("Send aborted because there is no connection."));
+ ExLog.i(this, TAG, "Send aborted because there is no connection.");
try {
persistenceManager.persistIntent(intent);
} catch (UnsupportedEncodingException e) {
@@ -240,10 +240,10 @@ public class MessageSendingService extends Service implements MessageSendingList
}
private void handleDelayedMessages() {
- ExLog.i(this, TAG, String.format("Trying to resend stored messages..."));
+ ExLog.i(this, TAG, "Trying to resend stored messages...");
isHandlerSet = false;
if (!isConnected()) {
- ExLog.i(this, TAG, String.format("Resend aborted because there is no connection."));
+ ExLog.i(this, TAG, "Resend aborted because there is no connection.");
ConnectivityChangedReceiver.enable(this);
serviceLogger.onMessageSentFailed();
} else {
@@ -281,16 +281,15 @@ public class MessageSendingService extends Service implements MessageSendingList
}
@Override
- public void onMessageSent(Intent intent, boolean success, InputStream inputStream) {
- ExLog.i(this, "MS", "on message sent");
- int resendMillis = PrefUtils.getInt(this, R.string.preference_messageResendIntervalMillis_key,
- R.integer.preference_messageResendIntervalMillis_default);
- if (!success) {
- ExLog.i(this, "MS", "!success");
+ public void onMessageSent(MessageSenderResult result) {
+ ExLog.i(this, TAG, "onMessageSent");
+ int resendMillis = PrefUtils.getInt(this, R.string.preference_messageResendIntervalMillis_key, R.integer.preference_messageResendIntervalMillis_default);
+ if (!result.isSuccessful()) {
+ ExLog.i(this, TAG, "!success");
reportApiConnectivity(APIConnectivity.transmissionError);
ExLog.w(this, TAG, "Error while posting intent to server. Will persist intent...");
try {
- persistenceManager.persistIntent(intent);
+ persistenceManager.persistIntent(result.getIntent());
} catch (UnsupportedEncodingException e) {
ExLog.e(this, TAG, "Could not store message (unsupported encoding)");
}
@@ -302,12 +301,12 @@ public class MessageSendingService extends Service implements MessageSendingList
reportUnsentGPSFixesCount();
serviceLogger.onMessageSentFailed();
} else {
- ExLog.i(this, "MS", "success");
+ ExLog.i(this, TAG, "success");
reportApiConnectivity(APIConnectivity.transmissionSuccess);
ExLog.i(this, TAG, "Message successfully sent.");
if (persistenceManager.areIntentsDelayed()) {
try {
- persistenceManager.removeIntent(intent);
+ persistenceManager.removeIntent(result.getIntent());
} catch (UnsupportedEncodingException e) {
ExLog.e(this, TAG, "Could not remove message (unsupported encoding)");
}
@@ -316,8 +315,8 @@ public class MessageSendingService extends Service implements MessageSendingList
if (serviceLogger != null) {
serviceLogger.onMessageSentSuccessful();
}
-
- String callbackClassString = intent.getStringExtra(CALLBACK_CLASS);
+
+ String callbackClassString = result.getIntent().getStringExtra(CALLBACK_CLASS);
ServerReplyCallback callback = null;
if (callbackClassString != null) {
try {
@@ -328,51 +327,47 @@ public class MessageSendingService extends Service implements MessageSendingList
}
}
if (callback != null) {
- String raceId = intent.getStringExtra(CALLBACK_PAYLOAD);
- callback.processResponse(this, inputStream, raceId);
+ String raceId = result.getIntent().getStringExtra(CALLBACK_PAYLOAD);
+ callback.processResponse(this, result.getInputStream(), raceId);
}
- ExLog.i(this, "MS", "report");
+ ExLog.i(this, TAG, "report");
reportUnsentGPSFixesCount();
}
}
/**
* checks if there is network connectivity
- *
+ *
* @return connectivity check value
*/
private boolean isConnected() {
NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
- if (activeNetwork == null) {
- return false;
- }
- return activeNetwork.isConnected();
+ return activeNetwork != null && activeNetwork.isConnected();
}
-
+
/**
* a UUID that identifies this client session; can be used, e.g., to let the server identify subsequent requests coming from the same client
*/
public final static UUID uuid = UUID.randomUUID();
-
+
public static String getRaceLogEventSendAndReceiveUrl(Context context, final String raceGroupName,
- final String raceName, final String fleetName) throws UnsupportedEncodingException {
- String url = String.format("%s/sailingserver/rc/racelog?"+
- RaceLogServletConstants.PARAMS_LEADERBOARD_NAME+"=%s&"+
- RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME+"=%s&"+
- RaceLogServletConstants.PARAMS_RACE_FLEET_NAME+"=%s&"+
- RaceLogServletConstants.PARAMS_CLIENT_UUID+"=%s",
+ final String raceName, final String fleetName) throws UnsupportedEncodingException {
+ String url = String.format("%s/sailingserver/rc/racelog?" +
+ RaceLogServletConstants.PARAMS_LEADERBOARD_NAME + "=%s&" +
+ RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME + "=%s&" +
+ RaceLogServletConstants.PARAMS_RACE_FLEET_NAME + "=%s&" +
+ 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;
}
/**
* Register listener for API-connectivity
*
- * @param listener
- * class that wants to be notified of api-connectivity changes
+ * @param listener class that wants to be notified of api-connectivity changes
*/
public void registerAPIConnectivityListener(APIConnectivityListener listener) {
apiConnectivityListener = listener;
@@ -424,8 +419,6 @@ public class MessageSendingService extends Service implements MessageSendingList
/**
* Report the number of currently unsent GPS-fixes
- *
- * @param unsentGPSFixesCount
*/
private void reportUnsentGPSFixesCount() {
if (apiConnectivityListener != null) {
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/SendingServiceAwareActivity.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/SendingServiceAwareActivity.java
index 21b552c66e5..bea1680d8ea 100644
--- a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/SendingServiceAwareActivity.java
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/ui/activities/SendingServiceAwareActivity.java
@@ -20,7 +20,7 @@ import com.sap.sailing.android.shared.services.sending.MessageSendingService.Mes
import com.sap.sailing.android.shared.util.PrefUtils;
public abstract class SendingServiceAwareActivity extends ResilientActivity {
-
+
private class MessageSendingServiceConnection implements ServiceConnection, MessageSendingServiceLogger {
@Override
public void onServiceConnected(ComponentName className, IBinder service) {
@@ -55,9 +55,9 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity {
protected boolean boundSendingService = false;
protected MessageSendingService sendingService;
private MessageSendingServiceConnection sendingServiceConnection;
-
+
private String sendingServiceStatus = "";
-
+
public SendingServiceAwareActivity() {
this.sendingServiceConnection = new MessageSendingServiceConnection();
}
@@ -65,15 +65,15 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity {
@Override
public void onStart() {
super.onStart();
-
+
Intent intent = new Intent(this, MessageSendingService.class);
bindService(intent, sendingServiceConnection, Context.BIND_AUTO_CREATE);
}
-
+
@Override
public void onStop() {
super.onStop();
-
+
if (boundSendingService) {
unbindService(sendingServiceConnection);
boundSendingService = false;
@@ -83,28 +83,27 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity {
protected void updateSendingServiceInformation() {
if (menuItemLive == null)
return;
-
+
if (!boundSendingService)
return;
-
- int errorCount = this.sendingService.getDelayedIntentsCount();
+
+ int errorCount = sendingService.getDelayedIntentsCount();
if (errorCount > 0) {
menuItemLive.setIcon(R.drawable.ic_menu_share_red);
Date lastSuccessfulSend = this.sendingService.getLastSuccessfulSend();
- sendingServiceStatus = String.format("Currently %d events waiting to be sent.\nLast successful sent was at %s",
- errorCount, lastSuccessfulSend == null ? "never" : lastSuccessfulSend);
+ sendingServiceStatus = getString(R.string.sending_waiting, errorCount, lastSuccessfulSend == null ? "never" : lastSuccessfulSend);
} else {
menuItemLive.setIcon(R.drawable.ic_menu_share);
- sendingServiceStatus = String.format("Currently no event waiting to be sent.", errorCount);
+ sendingServiceStatus = getString(R.string.sending_no_waiting);
}
}
-
+
/**
* @return the resource ID for the options menu, {@code 0} if none.
- * The menu item displaying the connection status is added automatically.
+ * The menu item displaying the connection status is added automatically.
*/
protected abstract int getOptionsMenuResId();
-
+
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
@@ -115,7 +114,7 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity {
}
return true;
}
-
+
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (R.id.options_menu_live == item.getItemId()) {
@@ -126,7 +125,7 @@ public abstract class SendingServiceAwareActivity extends ResilientActivity {
return super.onOptionsItemSelected(item);
}
}
-
+
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
updateSendingServiceInformation();
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/AuthCheckTask.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/AuthCheckTask.java
new file mode 100644
index 00000000000..547ca6b78ff
--- /dev/null
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/AuthCheckTask.java
@@ -0,0 +1,78 @@
+package com.sap.sailing.android.shared.util;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+
+import android.content.Context;
+import android.os.AsyncTask;
+
+import com.sap.sailing.android.shared.data.http.HttpJsonGetRequest;
+import com.sap.sailing.android.shared.data.http.HttpRequest;
+import com.sap.sailing.android.shared.logging.ExLog;
+
+public class AuthCheckTask extends AsyncTask {
+
+ private static final String TAG = AuthCheckTask.class.getName();
+
+ private final static String HELLO_REQUEST = "/security/api/restsecurity/hello";
+
+ private Context context;
+ private URL url;
+ private AuthCheckTaskListener listener;
+ private Exception exception;
+
+ public AuthCheckTask(Context ctx, String baseUrl, AuthCheckTaskListener taskListener) {
+ try {
+ context = ctx;
+ url = new URL(baseUrl + HELLO_REQUEST);
+ listener = taskListener;
+ } catch (MalformedURLException e) {
+ ExLog.e(context, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e.getMessage());
+ }
+ }
+
+ @Override
+ protected Boolean doInBackground(Void... params) {
+ Boolean authenticated = false;
+ if (url != null) {
+ try {
+ HttpRequest request = new HttpJsonGetRequest(url, context);
+ InputStream responseStream = request.execute();
+
+ JSONParser parser = new JSONParser();
+ JSONObject json = (JSONObject) parser.parse(new InputStreamReader(responseStream));
+ if (json.containsKey("authenticated")) {
+ authenticated = (Boolean) json.get("authenticated");
+ }
+ } catch (Exception e) {
+ exception = e;
+ }
+ } else {
+ exception = new IllegalArgumentException();
+ }
+ return authenticated;
+ }
+
+ @Override
+ protected void onPostExecute(Boolean authenticated) {
+ super.onPostExecute(authenticated);
+ if (listener != null) {
+ if (exception != null) {
+ listener.onException(exception);
+ } else {
+ listener.onRequestReceived(authenticated);
+ }
+ }
+ }
+
+ public interface AuthCheckTaskListener {
+ void onRequestReceived(Boolean authenticated);
+
+ void onException(Exception exception);
+ }
+}
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LoginTask.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LoginTask.java
new file mode 100644
index 00000000000..b10cd51b2d9
--- /dev/null
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LoginTask.java
@@ -0,0 +1,77 @@
+package com.sap.sailing.android.shared.util;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+
+import android.content.Context;
+import android.os.AsyncTask;
+
+import com.sap.sailing.android.shared.data.LoginData;
+import com.sap.sailing.android.shared.data.http.HttpRequest;
+import com.sap.sailing.android.shared.data.http.LoginGetRequest;
+import com.sap.sailing.android.shared.logging.ExLog;
+
+public class LoginTask extends AsyncTask {
+
+ private static final String TAG = LoginTask.class.getName();
+
+ private final static String TOKEN_REQUEST = "/security/api/restsecurity/access_token";
+
+ private URL url = null;
+ private Context context;
+ private LoginTaskListener listener;
+ private Exception exception;
+
+ public LoginTask(Context context, String baseUrl, LoginTaskListener listener) {
+ try {
+ this.context = context.getApplicationContext();
+ this.url = new URL(baseUrl + TOKEN_REQUEST);
+ this.listener = listener;
+ } catch (MalformedURLException e) {
+ ExLog.e(context, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e.getMessage());
+ }
+ }
+
+ @Override
+ protected String doInBackground(LoginData... params) {
+ String access_token = null;
+ if (url != null && params != null && params.length > 0) {
+ try {
+ HttpRequest request = new LoginGetRequest(url, context, params[0]);
+ InputStream responseStream = request.execute();
+
+ JSONParser parser = new JSONParser();
+ JSONObject result = (JSONObject) parser.parse(new InputStreamReader(responseStream));
+ access_token = (String) result.get("access_token");
+ } catch (Exception e) {
+ exception = e;
+ }
+ } else {
+ exception = new IllegalArgumentException();
+ }
+ return access_token;
+ }
+
+ @Override
+ protected void onPostExecute(String accessToken) {
+ super.onPostExecute(accessToken);
+ if (listener != null) {
+ if (exception != null) {
+ listener.onException(exception);
+ } else {
+ listener.onTokenReceived(accessToken);
+ }
+ }
+ }
+
+ public interface LoginTaskListener {
+ void onTokenReceived(String accessToken);
+
+ void onException(Exception exception);
+ }
+}
diff --git a/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LogoutTask.java b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LogoutTask.java
new file mode 100644
index 00000000000..16ee0a7cabe
--- /dev/null
+++ b/mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/LogoutTask.java
@@ -0,0 +1,44 @@
+package com.sap.sailing.android.shared.util;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import android.content.Context;
+import android.os.AsyncTask;
+
+import com.sap.sailing.android.shared.data.http.HttpJsonGetRequest;
+import com.sap.sailing.android.shared.data.http.HttpRequest;
+import com.sap.sailing.android.shared.logging.ExLog;
+
+public class LogoutTask extends AsyncTask {
+
+ private static final String TAG = LogoutTask.class.getName();
+ private static final String LOGOUT_REQUEST = "/security/api/restsecurity/remove_access_token";
+
+ private Context context;
+ private URL url;
+
+ public LogoutTask(Context ctx, String baseUrl) {
+ context = ctx;
+ try {
+ url = new URL(baseUrl + LOGOUT_REQUEST);
+ } catch (MalformedURLException e) {
+ ExLog.e(context, TAG, "Error: Failed to perform checking due to a MalformedURLException: " + e.getMessage());
+
+ }
+ }
+
+ @Override
+ protected Void doInBackground(String... params) {
+ if (url != null && params != null && params.length > 0) {
+ HttpRequest request = new HttpJsonGetRequest(url, context);
+ try {
+ request.execute();
+ } catch (IOException e) {
+ ExLog.e(context, TAG, "Logout not possible: " + e.getMessage());
+ }
+ }
+ return null;
+ }
+}
diff --git a/mobile/com.sap.sailing.android.tracking.app/build.gradle b/mobile/com.sap.sailing.android.tracking.app/build.gradle
index 6ab855a8544..28f1e791c1f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/build.gradle
+++ b/mobile/com.sap.sailing.android.tracking.app/build.gradle
@@ -75,7 +75,7 @@ dependencies {
compile "com.google.android.gms:play-services-gcm:${rootProject.ext.play_services}"
compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
- /* licence dialog */
+ /* license dialog */
compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
/* local dependencies */
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java
index 7d6f5906003..076458c080c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/AboutFragment.java
@@ -28,10 +28,10 @@ public class AboutFragment extends com.sap.sailing.android.ui.fragments.BaseFrag
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_about, container, false);
- view.findViewById(R.id.licence_button).setOnClickListener(new View.OnClickListener() {
+ view.findViewById(R.id.license_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- showLicenceDialog();
+ showLicenseDialog();
}
});
view.findViewById(R.id.eula_button).setOnClickListener(new View.OnClickListener() {
@@ -45,7 +45,7 @@ public class AboutFragment extends com.sap.sailing.android.ui.fragments.BaseFrag
return view;
}
- private void showLicenceDialog() {
+ private void showLicenseDialog() {
Notices notices = new Notices();
LicenseHelper licenseHelper = new LicenseHelper();
notices.addNotice(licenseHelper.getAndroidSupportNotice());
@@ -53,7 +53,7 @@ public class AboutFragment extends com.sap.sailing.android.ui.fragments.BaseFrag
notices.addNotice(licenseHelper.getJsonSimpleNotice());
notices.addNotice(licenseHelper.getDialogNotice());
LicensesDialog.Builder builder = new LicensesDialog.Builder(getActivity());
- builder.setTitle(getString(R.string.licence_information));
+ builder.setTitle(getString(R.string.license_information));
builder.setNotices(notices);
builder.build().show();
}
diff --git a/mobile/com.sap.sailing.buoy.positioning/build.gradle b/mobile/com.sap.sailing.buoy.positioning/build.gradle
index ea9b08f4f89..6eea899e38c 100644
--- a/mobile/com.sap.sailing.buoy.positioning/build.gradle
+++ b/mobile/com.sap.sailing.buoy.positioning/build.gradle
@@ -74,7 +74,7 @@ dependencies {
/* Google Play Services */
compile "com.google.android.gms:play-services-location:${rootProject.ext.play_services}"
- /* licence dialog */
+ /* license dialog */
compile("de.psdev.licensesdialog:licensesdialog:${rootProject.ext.license_dialog}")
/* local dependencies */
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java
index 0c9e56c2652..25cc30fc0f0 100644
--- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/AboutFragment.java
@@ -29,10 +29,10 @@ public class AboutFragment extends BaseFragment {
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_about, container, false);
- view.findViewById(R.id.licence_button).setOnClickListener(new View.OnClickListener() {
+ view.findViewById(R.id.license_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- showLicenceDialog();
+ showLicenseDialog();
}
});
view.findViewById(R.id.eula_button).setOnClickListener(new View.OnClickListener() {
@@ -46,7 +46,7 @@ public class AboutFragment extends BaseFragment {
return view;
}
- private void showLicenceDialog() {
+ private void showLicenseDialog() {
Notices notices = new Notices();
LicenseHelper licenseHelper = new LicenseHelper();
notices.addNotice(licenseHelper.getAndroidSupportNotice());
@@ -54,7 +54,7 @@ public class AboutFragment extends BaseFragment {
notices.addNotice(licenseHelper.getJsonSimpleNotice());
notices.addNotice(licenseHelper.getDialogNotice());
LicensesDialog.Builder builder = new LicensesDialog.Builder(getActivity());
- builder.setTitle(getString(R.string.licence_information));
+ builder.setTitle(getString(R.string.license_information));
builder.setNotices(notices);
builder.build().show();
}
diff --git a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
index ff63e9cb333..00b33d16cf3 100644
--- a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
@@ -53,6 +53,7 @@
+
+
+
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/accuracy.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/accuracy.xml
index 80cc48ade0c..bb56ef5802b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/accuracy.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/accuracy.xml
@@ -29,7 +29,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml
index b068025f5b0..3f263645f15 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml
@@ -1,25 +1,54 @@
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+
+
+
+
+
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:alpha="0"
+ android:background="@color/constant_black_transparent">
+ android:orientation="horizontal">
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_onboarding.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_onboarding.xml
new file mode 100644
index 00000000000..7316f279119
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_onboarding.xml
@@ -0,0 +1,33 @@
+
+
+
+
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml
index eb1d9fc0564..8572902249a 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml
@@ -1,15 +1,15 @@
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+
+
+
+
+
+ android:alpha="0"
+ android:background="@color/constant_black_transparent">
+ android:orientation="horizontal">
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding.xml
deleted file mode 100644
index c39e473a608..00000000000
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_edit.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_edit.xml
index 3ecb52b4392..c11c89a70c9 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_edit.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_edit.xml
@@ -1,39 +1,49 @@
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="@dimen/side_padding">
-
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_normal.xml
deleted file mode 100644
index f7fc769e37c..00000000000
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_normal.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_xlarge.xml
deleted file mode 100644
index 9a7e775e692..00000000000
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_xlarge.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_normal.xml
deleted file mode 100644
index 3856e077065..00000000000
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_normal.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_xlarge.xml
deleted file mode 100644
index bc9017f6a44..00000000000
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_xlarge.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml
index 4040b5df015..582a58309c5 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml
@@ -19,13 +19,6 @@
android:layout_gravity="center_horizontal|bottom"
tools:layout="@layout/login_listviews"/>
-
+ android:layout_height="match_parent">
@@ -77,6 +77,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
+ android:alpha=".5"
android:background="@color/lock_background"
android:padding="@dimen/panel_lock_padding"
android:visibility="gone"
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/password_activity.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/password_activity.xml
new file mode 100644
index 00000000000..961e63333f8
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/password_activity.xml
@@ -0,0 +1,7 @@
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Nationalität
Nummer
Fotos schießen
- Möchten Sie sich abmelden?
- Wenn Sie sich abmelden, wird kein Rennen mehr verwaltet.
+ @string/logout
+ Wollen Sie sich abmelden und als neuer Nutzer anmelden. Ihre Rennen bleiben im Hintergrund erhalten.
+ Ummelden
+ Wenn Sie sich ummelden, wird kein Rennen mehr auf der aktuellen Bahn mehr verwaltet.
Abmelden
Lade Konfiguration…
Fehler beim Laden der Konfiguration.
@@ -254,7 +256,7 @@
Wenn aktiv kann man sich im Demo-Modus anmelden. Im Demo-Modus werden keine Rennänderungen an den Server geschickt.
Events geladen.
Verfügbare Rennen
- ÄNDERN
+ Ändern
Gestartet %s
Beendet %s
Wind
@@ -464,7 +466,20 @@
Group Race
Select Race
Getting Started
- http://www.sapsailing.com/gwt/Home.html?locale=de#SolutionsPlace:navigationTab=RaceCommitteeApp
+ https://www.sapsailing.com/gwt/Home.html?locale=de#SolutionsPlace:navigationTab=RaceCommitteeApp
Request fehlgeschlagen. User ist nicht autorisiert.
+ Server
+ Nutzername
+ Passwort
+ Nutzername oder Passwort ungültig
+ Ein unerwarteter Fehler ist aufgetreten
+ Warnung
+ Sie haben wahrscheinlich nicht die Befugnis Daten an den Server zu schicken. Möchten Sie sich als andere Nutzer anmelden?
+
+ Ein
+ Aus
+ Rechtweisend
+ Missweisend
+ Kursanzeige
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
index 03249a3a0ac..c63fad1e780 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
@@ -7,8 +7,6 @@
+
+ 3dp
+
+
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml
index d0f8fd23b31..cecc7ea40c9 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/attrs.xml
@@ -22,6 +22,7 @@
2dp
3dp
+ 9dp
+
12sp
14sp
16sp
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
index 8cde9e5f53c..298da4716b6 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
@@ -19,7 +19,7 @@
mailRecipientPreference
- lukas.niemeier@sap.com
+ pollingActivePreference
true
@@ -76,7 +76,9 @@
false
basicIndividualRecall
-
+ preferenceHeadingWithDeclinationSubtracted
+ true
+
racecommittee
false
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
index f3bdfb957db..36ce2c7c331 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
@@ -8,8 +8,6 @@
Set tracking list
Confirm tracking list
Snap
- Are you sure want to logout?
- Logging out stops automatic monitoring for all races.
+ Sign out
+ Do you want to sign out and sign in as a new user? All your races will still be monitored.
+ Change Regatta
+ Do you want to change a regatta and/or the area? Currently monitored races will be disconnected.
Logout
Loading configuration…
There was an error loading the configuration.
@@ -206,7 +208,7 @@
Pathfinder
Activate this option to enable choosing the additional Golf-Down time
Additional Golf-down time
- Device identifier
+ Device Name
Synchronize with server
When creating a configuration on the server, click here to synchronize your app and connection settings via QRCode.
Force update
@@ -286,7 +288,7 @@
ALL RACES
WELCOME
- CHANGE
+ Change
Procedure
More
@@ -491,7 +493,20 @@
Group Racing
Select Race
Getting Started
- http://www.sapsailing.com/gwt/Home.html?locale=en#SolutionsPlace:navigationTab=RaceCommitteeApp
+ https://www.sapsailing.com/gwt/Home.html?locale=en#SolutionsPlace:navigationTab=RaceCommitteeApp
Request failed. User is unauthorized.
+ Server
+ Username
+ Password
+ Username or password invalid
+ An unexpected error occurred
+ Warning
+ You probably don\'t have the permission to send data to the server. Do you want to change your login credentials?
+
+ On
+ Off
+ Magnetic
+ North-based
+ Heading
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
index d06d92230ba..7ddb0891382 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/themes_dark.xml
@@ -37,6 +37,7 @@