eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 01:59:35 +00:00
Code Activity

some renames to make clear where we're dealing with the String-conversion of the Mark's ID

Browse Source 
Change-Id: Ie4e729d14b44b3c8a57a9ed9edb93e8e9ad30d17
This commit is contained in:
Axel Uhl committed 2016-04-15 12:05:33 +02:00
1 parent 52021d77ef
commit 13b56abcfe
3 files changed
+10 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/PositioningActivity.java
+4 -4
View File
@@ -23,7 +23,7 @@ public class PositioningActivity extends BaseActivity implements pingListener {
private MarkInfo markInfo;
private MarkPingInfo markPing;
private LeaderboardInfo leaderBoard;
private String markerID;
private String markIdAsString;
private String checkinDigest;
@Override
@@ -31,7 +31,7 @@ public class PositioningActivity extends BaseActivity implements pingListener {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_container);
Intent intent = getIntent();
markerID = intent.getExtras().getString(getString(R.string.mark_id));
markIdAsString = intent.getExtras().getString(getString(R.string.mark_id));
checkinDigest = intent.getExtras().getString(getString(R.string.checkin_digest));
loadDataFromDatabase();
@@ -60,13 +60,13 @@ public class PositioningActivity extends BaseActivity implements pingListener {
List<MarkInfo> marks = DatabaseHelper.getInstance().getMarks(this, checkinDigest);
setLeaderBoard(DatabaseHelper.getInstance().getLeaderboard(this, checkinDigest));
for (MarkInfo mark : marks) {
if (mark.getId().toString().equals(markerID)) {
if (mark.getId().toString().equals(markIdAsString)) {
setMarkInfo(mark);
break;
}
}
if (markInfo != null) {
setPingFromDatabase(markerID);
setPingFromDatabase(markIdAsString);
}
}
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/AppPreferences.java
+2 -2
View File
@@ -21,10 +21,10 @@ public class AppPreferences extends BaseAppPreferences {
cleanLeaderBoardName);
}
public String getServerMarkPingPath(String leaderBoardName, String markID) {
public String getServerMarkPingPath(String leaderBoardName, String markIdAsString) {
String cleanLeaderBoardName = leaderBoardName.replaceAll(" ", "%20");
return context.getString(R.string.preference_server_gps_fixes_post_path)
.replace("{leaderboard_name}", cleanLeaderBoardName).replace("{mark-id}", markID);
.replace("{leaderboard_name}", cleanLeaderBoardName).replace("{mark-id}", markIdAsString);
}
public void setDataRefreshInterval(long interval){
mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/DatabaseHelper.java
+4 -4
View File
@@ -122,12 +122,12 @@ public class DatabaseHelper {
return marks;
}
public void deletePingsFromDataBase(Context context, String markID) {
public void deletePingsFromDataBase(Context context, String markIdAsString) {
ContentResolver cr = context.getContentResolver();
int d1 = cr.delete(MarkPing.CONTENT_URI, MarkPing.MARK_ID + " = ?", new String[] { markID });
int d1 = cr.delete(MarkPing.CONTENT_URI, MarkPing.MARK_ID + " = ?", new String[] { markIdAsString });
if (BuildConfig.DEBUG) {
ExLog.i(context, TAG, "Checkout, number of markpings for mark: " + markID + " deleted: " + d1);
ExLog.i(context, TAG, "Checkout, number of markpings for mark: " + markIdAsString + " deleted: " + d1);
}
}
@@ -248,7 +248,7 @@ public class DatabaseHelper {
for (MarkInfo mark : markList) {
ContentValues cmv = new ContentValues();
cmv.put(Mark.MARK_CHECKIN_DIGEST, mark.getCheckinDigest());
cmv.put(Mark.MARK_ID, mark.getId().toString().toString());
cmv.put(Mark.MARK_ID, mark.getId().toString());
cmv.put(Mark.MARK_NAME, mark.getName());
cmv.put(Mark.MARK_TYPE, mark.getType().toString());
cmv.put(Mark.MARK_CLASS_NAME, mark.getClassName());