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

image file name is now competitor id, so it can be used across regattas

Browse Source
This commit is contained in:
Peter Siegmund
2016-07-19 13:03:18 +02:00
parent 68e66228fb
commit 19e4927b56
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/RegattaActivity.java
+12 -12
View File
@@ -68,8 +68,8 @@ public class RegattaActivity extends AbstractRegattaActivity
implements RegattaFragment.FragmentWatcher, UploadResponseHandler {
private final static String TAG = RegattaActivity.class.getName();
private final static String LEADERBOARD_IMAGE_FILENAME_PREFIX = "leaderboardImage_";
private final static String FLAG_IMAGE_FILENAME_PREFIX = "flagImage_";
private final static String COMPETITOR_IMAGE_FILENAME_PREFIX = "competitor_";
private final static String FLAG_IMAGE_FILENAME_PREFIX = "flag_";
public EventInfo event;
public CompetitorInfo competitor;
@@ -107,7 +107,7 @@ public class RegattaActivity extends AbstractRegattaActivity
if (toolbar != null) {
setSupportActionBar(toolbar);
}
if (getSupportActionBar() != null) {
if (toolbar != null && getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeButtonEnabled(true);
toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
@@ -237,7 +237,7 @@ public class RegattaActivity extends AbstractRegattaActivity
}
private void setTeamImage(ImageView imageView, int width, int height) {
String fileName = getTeamImageFileName(leaderboard.name, competitor.name);
String fileName = getCompetitorImageFileName(competitor.id);
Bitmap storedImage = getStoredImage(fileName, width, height);
if (storedImage == null) {
askServerAboutTeamImageUrl(imageView);
@@ -307,7 +307,7 @@ public class RegattaActivity extends AbstractRegattaActivity
* @param bitmap
*/
public void updateLeaderboardPictureChosenByUser(final Bitmap bitmap) {
storeImageAndSendToServer(bitmap, getTeamImageFileName(leaderboard.name, competitor.name), true);
storeImageAndSendToServer(bitmap, getCompetitorImageFileName(competitor.id), true);
runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -380,7 +380,7 @@ public class RegattaActivity extends AbstractRegattaActivity
File mediaStorageDir = getMediaStorageDir();
File mediaFile;
String mImageName = "MI_" + fileName + ".png";
String mImageName = fileName + ".png";
mediaFile = new File(mediaStorageDir.getPath() + File.separator + mImageName);
return mediaFile;
}
@@ -389,7 +389,7 @@ public class RegattaActivity extends AbstractRegattaActivity
File mediaStorageDir = getMediaStorageDir();
File mediaFile;
String mImageName = "MI_" + fileName + ".png";
String mImageName = fileName + ".png";
mediaFile = new File(mediaStorageDir.getPath() + File.separator + mImageName);
return mediaFile.delete();
@@ -443,8 +443,8 @@ public class RegattaActivity extends AbstractRegattaActivity
setUpView();
}
private String getTeamImageFileName(String leaderboardName, String competitorName) {
return LEADERBOARD_IMAGE_FILENAME_PREFIX + leaderboardName + "_" + competitorName;
private String getCompetitorImageFileName(String competitorId) {
return COMPETITOR_IMAGE_FILENAME_PREFIX + competitorId;
}
private String getFlagImageFileName(String countryCode) {
@@ -494,7 +494,7 @@ public class RegattaActivity extends AbstractRegattaActivity
public void performAction(JSONObject response) {
DatabaseHelper.getInstance().deleteRegattaFromDatabase(RegattaActivity.this,
event.checkinDigest);
deleteImageFile(getTeamImageFileName(leaderboard.name, competitor.name));
deleteImageFile(getCompetitorImageFileName(competitor.id));
dismissProgressDialog();
finish();
}
@@ -554,7 +554,7 @@ public class RegattaActivity extends AbstractRegattaActivity
public void retryUpload(View view) {
if (prefs.hasFailedUpload(leaderboard.name)) {
pictureFile = getImageFile(getTeamImageFileName(leaderboard.name, competitor.name));
pictureFile = getImageFile(getCompetitorImageFileName(competitor.id));
}
if (pictureFile != null) {
sendTeamImageToServer(pictureFile);
@@ -616,7 +616,7 @@ public class RegattaActivity extends AbstractRegattaActivity
FileOutputStream outputStream = null;
try {
in = new java.net.URL(downloadUrl).openStream();
imageFile = getImageFile(getTeamImageFileName(leaderboard.name, competitor.name));
imageFile = getImageFile(getCompetitorImageFileName(competitor.id));
if (!imageFile.exists()) {
imageFile.createNewFile();
}