From 0b4d72be0e9b2f8f4a5c1ae01887b457338a8451 Mon Sep 17 00:00:00 2001 From: Bennet Brunsen Date: Fri, 27 Mar 2015 15:27:19 +0100 Subject: [PATCH] Implements refresh function for marks on new checkin and inside RegattaActivity --- .../res/values-de/strings.xml | 1 + .../res/values/strings.xml | 1 + .../res/values-de/strings.xml | 1 - .../res/values/strings.xml | 1 - .../res/menu/regatta_menu.xml | 6 + .../res/values/colors.xml | 2 +- .../positioning/app/adapter/MarkAdapter.java | 4 +- .../app/provider/AnalyticsProvider.java | 4 +- .../ui/activities/PositioningActivity.java | 4 +- .../app/ui/activities/RegattaActivity.java | 120 ++++++++++++------ .../app/ui/fragments/BuoyFragment.java | 1 - .../app/ui/fragments/HomeFragment.java | 14 +- .../app/ui/fragments/RegattaFragment.java | 7 +- .../positioning/app/util/CheckinManager.java | 29 +++-- .../positioning/app/util/DatabaseHelper.java | 16 ++- .../buoy/positioning/app/util/PingHelper.java | 12 +- .../app/valueobjects/CheckinData.java | 8 +- 17 files changed, 145 insertions(+), 86 deletions(-) create mode 100644 mobile/com.sap.sailing.buoy.positioning/res/menu/regatta_menu.xml diff --git a/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml b/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml index 957bdb631f6..4f96f94f5a0 100644 --- a/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml +++ b/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml @@ -29,5 +29,6 @@ Ihre Regattas: + Aktualisieren \ 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 78f182936ce..9103d8ead67 100644 --- a/mobile/com.sap.sailing.android.shared/res/values/strings.xml +++ b/mobile/com.sap.sailing.android.shared/res/values/strings.xml @@ -30,6 +30,7 @@ Your Regattas: + Refresh Error: Database operation has failed. diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml index 84d57a7f5c1..5e73740d034 100644 --- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml +++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml @@ -9,7 +9,6 @@ Checkout Team Foto hinzufügen Team Foto ersetzen - Aktualisieren Andere Einstellungen Der QR-Code befindet sich auf Ihrer Teilnahmebestätigung Geräte-ID diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml index 659ac82bb1d..cc1455d3a9e 100644 --- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml +++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml @@ -7,7 +7,6 @@ Checkout Add Team Photo Replace Team Photo - Refresh Other Settings Device Identifier SAP Sailing Tracker started diff --git a/mobile/com.sap.sailing.buoy.positioning/res/menu/regatta_menu.xml b/mobile/com.sap.sailing.buoy.positioning/res/menu/regatta_menu.xml new file mode 100644 index 00000000000..539eb7da2bf --- /dev/null +++ b/mobile/com.sap.sailing.buoy.positioning/res/menu/regatta_menu.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml index 891c613302b..409851cf238 100644 --- a/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml +++ b/mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml @@ -1,4 +1,4 @@ - + #FFFFFF #55FFFFFF diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/MarkAdapter.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/MarkAdapter.java index f96df20d088..410d05bac28 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/MarkAdapter.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/MarkAdapter.java @@ -1,8 +1,6 @@ package com.sap.sailing.android.buoy.positioning.app.adapter; -import java.util.List; - import android.content.Context; import android.database.Cursor; import android.support.v4.widget.ResourceCursorAdapter; @@ -14,6 +12,8 @@ import com.sap.sailing.android.buoy.positioning.app.provider.AnalyticsContract; import com.sap.sailing.android.buoy.positioning.app.util.DatabaseHelper; import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkPingInfo; +import java.util.List; + public class MarkAdapter extends ResourceCursorAdapter { diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/provider/AnalyticsProvider.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/provider/AnalyticsProvider.java index c20c0198cab..9abd14d4bd9 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/provider/AnalyticsProvider.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/provider/AnalyticsProvider.java @@ -1,7 +1,5 @@ package com.sap.sailing.android.buoy.positioning.app.provider; -import java.util.Arrays; - import android.content.ContentProvider; import android.content.ContentValues; import android.content.Context; @@ -22,6 +20,8 @@ import com.sap.sailing.android.buoy.positioning.app.util.AppPreferences; import com.sap.sailing.android.shared.logging.ExLog; import com.sap.sailing.android.shared.util.SelectionBuilder; +import java.util.Arrays; + public class AnalyticsProvider extends ContentProvider { private static final String TAG = AnalyticsProvider.class.getName(); diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java index 057a6f77892..6901857b4d9 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java @@ -1,7 +1,5 @@ package com.sap.sailing.android.buoy.positioning.app.ui.activities; -import java.util.List; - import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.Toolbar; @@ -14,6 +12,8 @@ import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkInfo; import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkPingInfo; import com.sap.sailing.android.shared.data.LeaderboardInfo; +import java.util.List; + public class PositioningActivity extends BaseActivity implements pingListener { private MarkInfo markInfo; diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java index dbd0b4fdd81..6d5a1f3cbec 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java @@ -1,28 +1,36 @@ package com.sap.sailing.android.buoy.positioning.app.ui.activities; -import java.util.ArrayList; -import java.util.List; - import android.content.Intent; import android.os.Bundle; import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import com.sap.sailing.android.buoy.positioning.app.BuildConfig; import com.sap.sailing.android.buoy.positioning.app.R; import com.sap.sailing.android.buoy.positioning.app.ui.fragments.RegattaFragment; import com.sap.sailing.android.buoy.positioning.app.util.AppPreferences; +import com.sap.sailing.android.buoy.positioning.app.util.CheckinManager; import com.sap.sailing.android.buoy.positioning.app.util.DatabaseHelper; +import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData; import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkInfo; import com.sap.sailing.android.shared.data.AbstractCheckinData; +import com.sap.sailing.android.shared.logging.ExLog; import com.sap.sailing.android.shared.ui.activities.AbstractRegattaActivity; -public class RegattaActivity extends AbstractRegattaActivity{ - - private String leaderboardName; - private String checkinDigest; - private List marks; - // private CheckinUrlInfo checkinUrl; - - private AppPreferences prefs; +import java.util.ArrayList; +import java.util.List; + +public class RegattaActivity extends AbstractRegattaActivity { + + private String leaderboardName; + private String checkinDigest; + private List marks; + private final String TAG = RegattaActivity.class.getName(); + private String checkinUrl; + + private AppPreferences prefs; @Override protected void onCreate(Bundle savedInstanceState) { @@ -36,8 +44,7 @@ public class RegattaActivity extends AbstractRegattaActivity{ checkinDigest = intent.getStringExtra(getString(R.string.checkin_digest)); leaderboardName = intent.getStringExtra(getString(R.string.leaderboard_name)); - // checkinUrl = DatabaseHelper.getInstance().getCheckinUrl(this, checkinDigest); - // manager = new CheckinManager(checkinUrl.urlString, this); + checkinUrl = DatabaseHelper.getInstance().getCheckinUrl(this, checkinDigest).urlString; setMarks(DatabaseHelper.getInstance().getMarks(this, checkinDigest)); @@ -58,35 +65,74 @@ public class RegattaActivity extends AbstractRegattaActivity{ RegattaFragment regattaFragment = new RegattaFragment(); replaceFragment(R.id.content_frame, regattaFragment); } - - @Override - public void onCheckinDataAvailable(AbstractCheckinData arg0) { - // TODO Auto-generated method stub - - } + @Override + protected void onResume() { + super.onResume(); + leaderboardName = (String) getIntent().getExtras().get(getString(R.string.leaderboard_name)); + setTitle(leaderboardName); + } - @Override - protected int getOptionsMenuResId() { - // TODO Auto-generated method stub - return 0; - } - - @Override - protected void onResume() { - super.onResume(); - leaderboardName = (String) getIntent().getExtras().get(getString(R.string.leaderboard_name)); - setTitle(leaderboardName); - } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.regatta_menu, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.refresh: + ExLog.i(this, TAG, "Clicked REFRESH."); + CheckinManager manager = new CheckinManager(checkinUrl, this); + manager.callServerAndGenerateCheckinData(); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + @Override + protected int getOptionsMenuResId() { + return R.menu.regatta_menu; + } - public List getMarks() { - return marks; - } + @Override + public void onCheckinDataAvailable(AbstractCheckinData checkinData) { + CheckinData data = (CheckinData) checkinData; + try { + DatabaseHelper.getInstance().deleteRegattaFromDatabase(this, data.checkinDigest); + DatabaseHelper.getInstance().storeCheckinRow(this, + data.marks, data.getLeaderboard(), + data.getCheckinUrl(), data.pings); + getRegattaFragment().getAdapter().notifyDataSetChanged(); + } catch (DatabaseHelper.GeneralDatabaseHelperException e) { + ExLog.e(this, TAG, + "Batch insert failed: " + e.getMessage()); + displayDatabaseError(); + return; + } + + if (BuildConfig.DEBUG) { + ExLog.i(this, TAG, + "Batch-insert of checkinData completed."); + } + } + + public RegattaFragment getRegattaFragment() { + return (RegattaFragment) getSupportFragmentManager().findFragmentById(R.id.content_frame); + } - public void setMarks(List marks) { - this.marks = marks; - } + public List getMarks() { + return marks; + } + + + public void setMarks(List marks) { + this.marks = marks; + } } diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java index 7d587215978..ca0fd21614f 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/BuoyFragment.java @@ -15,7 +15,6 @@ import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.MapFragment; import com.google.android.gms.maps.model.LatLng; -import com.google.android.gms.maps.model.LatLngBounds; import com.google.android.gms.maps.model.MarkerOptions; import com.sap.sailing.android.buoy.positioning.app.R; import com.sap.sailing.android.buoy.positioning.app.ui.activities.PositioningActivity; diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java index eec85136913..dcaf94fdb0a 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java @@ -25,7 +25,6 @@ import com.sap.sailing.android.buoy.positioning.app.util.AppPreferences; import com.sap.sailing.android.buoy.positioning.app.util.CheckinManager; import com.sap.sailing.android.buoy.positioning.app.util.DatabaseHelper; import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData; -import com.sap.sailing.android.buoy.positioning.app.valueobjects.MarkPingInfo; import com.sap.sailing.android.shared.data.AbstractCheckinData; import com.sap.sailing.android.shared.logging.ExLog; import com.sap.sailing.android.shared.ui.activities.CheckinDataActivity; @@ -80,14 +79,13 @@ public class HomeFragment extends AbstractHomeFragment implements private void checkinWithApiAndStartRegattaActivity(CheckinData checkinData) { try { - if(DatabaseHelper.getInstance().markLeaderboardCombnationAvailable(getActivity(), checkinData.checkinDigest)) { - DatabaseHelper.getInstance().storeCheckinRow(getActivity(), - checkinData.marks, checkinData.getLeaderboard(), - checkinData.getCheckinUrl(), checkinData.pings); - adapter.notifyDataSetChanged(); + if(!DatabaseHelper.getInstance().markLeaderboardCombnationAvailable(getActivity(), checkinData.checkinDigest)) { + DatabaseHelper.getInstance().deleteRegattaFromDatabase(getActivity(),checkinData.checkinDigest); } - // TODO: Save new pings, what if old pings exist locally? Delete old? - + DatabaseHelper.getInstance().storeCheckinRow(getActivity(), + checkinData.marks, checkinData.getLeaderboard(), + checkinData.getCheckinUrl(), checkinData.pings); + adapter.notifyDataSetChanged(); } catch (DatabaseHelper.GeneralDatabaseHelperException e) { ExLog.e(getActivity(), TAG, "Batch insert failed: " + e.getMessage()); diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/RegattaFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/RegattaFragment.java index 8098b3e2c56..90b2ce0c583 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/RegattaFragment.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/RegattaFragment.java @@ -23,7 +23,7 @@ import com.sap.sailing.android.ui.fragments.BaseFragment; public class RegattaFragment extends BaseFragment implements LoaderCallbacks{ private static final int MARKER_LOADER = 1; private MarkAdapter adapter; - + @SuppressLint("InflateParams") @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -46,6 +46,11 @@ public class RegattaFragment extends BaseFragment implements LoaderCallbacks onCreateLoader(int loaderId, Bundle bundle) { switch (loaderId) { diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java index c19233f996f..4bf7c01b630 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java @@ -1,19 +1,5 @@ package com.sap.sailing.android.buoy.positioning.app.util; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLEncoder; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import android.app.AlertDialog; import android.content.DialogInterface; import android.net.Uri; @@ -34,6 +20,20 @@ import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants; import com.sap.sailing.domain.racelogtracking.DeviceIdentifier; import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.UnsupportedEncodingException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLEncoder; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + public class CheckinManager { private final static String TAG = CheckinManager.class.getName(); @@ -289,6 +289,7 @@ public class CheckinManager { } public interface CheckinDataHandler { + public void onCheckinDataAvailable(CheckinData data); } private class URLData { diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/DatabaseHelper.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/DatabaseHelper.java index 9b69faed7dd..183146991ec 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/DatabaseHelper.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/DatabaseHelper.java @@ -1,8 +1,5 @@ package com.sap.sailing.android.buoy.positioning.app.util; -import java.util.ArrayList; -import java.util.List; - import android.content.ContentProviderOperation; import android.content.ContentResolver; import android.content.ContentValues; @@ -24,6 +21,9 @@ import com.sap.sailing.android.shared.data.CheckinUrlInfo; import com.sap.sailing.android.shared.data.LeaderboardInfo; import com.sap.sailing.android.shared.logging.ExLog; +import java.util.ArrayList; +import java.util.List; + public class DatabaseHelper { private final static String TAG = DatabaseHelper.class.getName(); @@ -114,14 +114,19 @@ public class DatabaseHelper { int d1 = cr.delete(MarkPing.CONTENT_URI, MarkPing.MARK_ID + " = \"" + markID + "\"", null); if (BuildConfig.DEBUG) { - ExLog.i(context, TAG, "Checkout, number of markpings deleted: " + d1); + ExLog.i(context, TAG, "Checkout, number of markpings for mark: " + markID + " deleted: " + d1); } } public void deleteRegattaFromDatabase(Context context, String checkinDigest) { ContentResolver cr = context.getContentResolver(); - // int d1 = cr.delete(Event.CONTENT_URI, Event.EVENT_CHECKIN_DIGEST + " = \"" + checkinDigest + "\"", null); + List marks = getMarks(context,checkinDigest); + + for(MarkInfo mark : marks){ + deletePingsFromDataBase(context, mark.getId()); + } + int d2 = cr.delete(Leaderboard.CONTENT_URI, Leaderboard.LEADERBOARD_CHECKIN_DIGEST + " = \"" + checkinDigest + "\"", null); int d3 = cr.delete(Mark.CONTENT_URI, Mark.MARK_CHECKIN_DIGEST + " = \"" + checkinDigest @@ -130,7 +135,6 @@ public class DatabaseHelper { + "\"", null); if (BuildConfig.DEBUG) { - // ExLog.i(context, TAG, "Checkout, number of events deleted: " + d1); ExLog.i(context, TAG, "Checkout, number of leaderbards deleted: " + d2); ExLog.i(context, TAG, "Checkout, number of marks deleted: " + d3); ExLog.i(context, TAG, "Checkout, number of checkinurls deleted: " + d4); diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/PingHelper.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/PingHelper.java index 952a8f3c91c..901a0810570 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/PingHelper.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/PingHelper.java @@ -1,11 +1,5 @@ package com.sap.sailing.android.buoy.positioning.app.util; -import java.net.MalformedURLException; -import java.net.URL; - -import org.json.JSONException; -import org.json.JSONObject; - import android.content.Context; import android.location.Location; import android.widget.Toast; @@ -20,6 +14,12 @@ import com.sap.sailing.android.shared.util.NetworkHelper; import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperError; import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperSuccessListener; +import org.json.JSONException; +import org.json.JSONObject; + +import java.net.MalformedURLException; +import java.net.URL; + public class PingHelper { private static String TAG = PingHelper.class.getName(); diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java index e810ef027d6..f5bf8114827 100644 --- a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java +++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java @@ -1,14 +1,14 @@ package com.sap.sailing.android.buoy.positioning.app.valueobjects; +import com.sap.sailing.android.shared.data.AbstractCheckinData; +import com.sap.sailing.android.shared.data.CheckinUrlInfo; +import com.sap.sailing.android.shared.data.LeaderboardInfo; + import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.List; -import com.sap.sailing.android.shared.data.AbstractCheckinData; -import com.sap.sailing.android.shared.data.CheckinUrlInfo; -import com.sap.sailing.android.shared.data.LeaderboardInfo; - public class CheckinData extends AbstractCheckinData{ public String leaderboardName; public String deviceUid;