eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-03 10:53:49 +00:00
Code Activity

superficial patch for bug 3823: avoiding the NPEs

Browse Source 
Change-Id: Idbaf764e875744f3a5598be6fb591c8f07965b52
This commit is contained in:
Axel Uhl committed 2016-07-25 11:28:04 +02:00
1 parent 19dd911861
commit c74c636283
1 file changed
+21 -16
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
+21 -16
View File
@@ -118,6 +118,7 @@ public class RegattaActivity extends AbstractRegattaActivity
ColorDrawable backgroundDrawable = new ColorDrawable(getResources().getColor(R.color.toolbar_background));
getSupportActionBar().setBackgroundDrawable(backgroundDrawable);
}
// FIXME bug 3823: a RegattaFragment must only be created if a competitor, not a mark, is being tracked
RegattaFragment regattaFragment = new RegattaFragment();
regattaFragment.setFragmentWatcher(this);
replaceFragment(R.id.content_frame, regattaFragment);
@@ -187,7 +188,6 @@ public class RegattaActivity extends AbstractRegattaActivity
hasPicture = true;
LinearLayout addTeamPhotoTextView = (LinearLayout) findViewById(R.id.add_photo);
addTeamPhotoTextView.setVisibility(View.INVISIBLE);
getRegattaFragment().setChangePhotoButtonHidden(false);
}
});
@@ -237,25 +237,29 @@ public class RegattaActivity extends AbstractRegattaActivity
}
private void setTeamImage(ImageView imageView, int width, int height) {
String fileName = getCompetitorImageFileName(competitor.id);
Bitmap storedImage = getStoredImage(fileName, width, height);
if (storedImage == null) {
askServerAboutTeamImageUrl(imageView);
} else {
imageView.setImageBitmap(storedImage);
userImageUpdated();
if (competitor != null && competitor.id != null) {
String fileName = getCompetitorImageFileName(competitor.id);
Bitmap storedImage = getStoredImage(fileName, width, height);
if (storedImage == null) {
askServerAboutTeamImageUrl(imageView);
} else {
imageView.setImageBitmap(storedImage);
userImageUpdated();
}
}
}
private void setFlagImage(ImageView imageView, int width, int height) {
String flagFileName = getFlagImageFileName(competitor.countryCode.toLowerCase(Locale.getDefault()));
Bitmap storedFlagImage = getStoredImage(flagFileName, width, height);
if (storedFlagImage == null) {
String urlStr = String.format("%s/gwt/images/flags/%s.png", event.server,
competitor.countryCode.toLowerCase(Locale.getDefault()));
new DownloadFlagImageTask(imageView, competitor.countryCode).execute(urlStr);
} else {
imageView.setImageBitmap(storedFlagImage);
if (competitor != null && competitor.countryCode != null) {
String flagFileName = getFlagImageFileName(competitor.countryCode.toLowerCase(Locale.getDefault()));
Bitmap storedFlagImage = getStoredImage(flagFileName, width, height);
if (storedFlagImage == null) {
String urlStr = String.format("%s/gwt/images/flags/%s.png", event.server,
competitor.countryCode.toLowerCase(Locale.getDefault()));
new DownloadFlagImageTask(imageView, competitor.countryCode).execute(urlStr);
} else {
imageView.setImageBitmap(storedFlagImage);
}
}
}
@@ -431,6 +435,7 @@ public class RegattaActivity extends AbstractRegattaActivity
regattaFragment.setFragmentWatcher(this);
replaceFragment(R.id.content_frame, regattaFragment);
}
// FIXME bug3823: what about MarkCheckinData? Which fragment shall be shown?
} catch (DatabaseHelper.GeneralDatabaseHelperException e) {
ExLog.e(this, TAG, "Batch insert failed: " + e.getMessage());
displayDatabaseError();