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

TRACKING APP: remove server-url from AppPreferences, fix calls

Browse Source
This commit is contained in:
Lukas Zielinski committed 2014-12-22 12:08:05 +01:00
1 parent 2d67baa49e
commit defd810e64
4 files changed
+6 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TransmittingService.java
+1 -1
View File
@@ -313,7 +313,7 @@ public class TransmittingService extends Service {
if (BuildConfig.DEBUG) {
ExLog.i(this, TAG, "sending gps fix json: " + requestObject.toString());
ExLog.i(this, TAG,
"url: " + prefs.getServerURL() + prefs.getServerGpsFixesPostPath());
"url: " + host + prefs.getServerGpsFixesPostPath());
}
if (host != null) {
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+1 -1
View File
@@ -386,7 +386,7 @@ public class RegattaActivity extends BaseActivity {
*/
public void checkout()
{
final String checkoutURLStr = prefs.getServerURL()
final String checkoutURLStr = event.server
+ prefs.getServerCheckoutPath().replace("{leaderboard-name}",
Uri.encode(leaderboard.name));
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/HomeFragment.java
+4 -9
View File
@@ -171,8 +171,6 @@ public class HomeFragment extends BaseFragment implements
final int port = (uri.getPort() == -1) ? 80 : uri.getPort();
final String hostWithPort = server + ":" + port;
prefs.setServerURL(hostWithPort);
String leaderboardNameFromQR;
try {
leaderboardNameFromQR = URLEncoder.encode(uri.getQueryParameter(CheckinHelper.LEADERBOARD_NAME),"UTF-8").replace("+", "%20");
@@ -186,7 +184,7 @@ public class HomeFragment extends BaseFragment implements
}
final String competitorId = uri.getQueryParameter(CheckinHelper.COMPETITOR_ID);
final String checkinURLStr = prefs.getServerURL()
final String checkinURLStr = hostWithPort
+ prefs.getServerCheckinPath().replace("{leaderboard-name}",
leaderboardNameFromQR);
final String eventId = uri.getQueryParameter(CheckinHelper.EVENT_ID);
@@ -204,9 +202,9 @@ public class HomeFragment extends BaseFragment implements
final StartActivity startActivity = (StartActivity)getActivity();
final String getEventUrl = prefs.getServerURL() + prefs.getServerEventPath(eventId);
final String getLeaderboardUrl = prefs.getServerURL() + prefs.getServerLeaderboardPath(leaderboardName);
final String getCompetitorUrl = prefs.getServerURL() + prefs.getServerCompetitorPath(competitorId);
final String getEventUrl = hostWithPort + prefs.getServerEventPath(eventId);
final String getLeaderboardUrl = hostWithPort + prefs.getServerLeaderboardPath(leaderboardName);
final String getCompetitorUrl = hostWithPort + prefs.getServerCompetitorPath(competitorId);
startActivity.showProgressDialog(R.string.please_wait, R.string.getting_leaderboard);
@@ -655,9 +653,6 @@ public class HomeFragment extends BaseFragment implements
// a
// header
// row
prefs.setServerURL(cursor.getString(cursor.getColumnIndex(Event.EVENT_SERVER)));
String leaderboardName = cursor.getString(cursor.getColumnIndex("leaderboard_name"));
String competitorId = cursor.getString(cursor.getColumnIndex("competitor_id"));
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
-8
View File
@@ -30,10 +30,6 @@ public class AppPreferences {
return DeviceIdentifier;
}
public String getServerURL() {
return PrefUtils.getString(context, R.string.preference_server_url_key, R.string.preference_server_url_default);
}
public String getServerGpsFixesPostPath() {
return PrefUtils.getString(context, R.string.preference_server_gps_fixes_post_path, R.string.preference_server_gps_fixes_post_path);
}
@@ -70,10 +66,6 @@ public class AppPreferences {
return value == null ? -1 : Integer.valueOf(value);
}
public void setServerURL(String serverUrl) {
preferences.edit().putString(context.getString(R.string.preference_server_url_key), serverUrl).commit();
}
public String getEventId() {
return PrefUtils.getString(context, R.string.preference_eventid_key, R.string.preference_eventid_default);
}