mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added safe handling of banner string ids

Browse source
This commit is contained in:
alexzatsepin 2016-12-18 13:24:28 +03:00 • committed by Vladimir Byko-Ianko
parent 2e1d268e15
commit a748c54654
2 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/src/com/mapswithme/maps/bookmarks/data/Banner.java
View file

@ -109,4 +109,17 @@ public final class Banner implements Parcelable
dest.writeString(mUrl);
dest.writeString(mTypes);
}
@Override
public String toString()
{
return "Banner{" +
"mId='" + mId + '\'' +
", mTitle='" + mTitle + '\'' +
", mMessage='" + mMessage + '\'' +
", mIconUrl='" + mIconUrl + '\'' +
", mUrl='" + mUrl + '\'' +
", mTypes='" + mTypes + '\'' +
'}';
}
}

39
android/src/com/mapswithme/maps/widget/placepage/BannerController.java
View file

@ -15,6 +15,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.crashlytics.android.Crashlytics;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
import com.mapswithme.maps.bookmarks.data.Banner;
@ -87,18 +88,8 @@ final class BannerController implements View.OnClickListener
return;
loadIcon(banner);
if (mTitle != null)
{
String title = mResources.getString(mResources.getIdentifier(banner.getTitle(), "string", mFrame.getContext().getPackageName()));
if (!TextUtils.isEmpty(title))
mTitle.setText(title);
}
if (mMessage != null)
{
String message = mResources.getString(mResources.getIdentifier(banner.getMessage(), "string", mFrame.getContext().getPackageName()));
if (!TextUtils.isEmpty(message))
mMessage.setText(message);
}
setLabelSafely(mTitle, mBanner.getTitle());
setLabelSafely(mMessage, mBanner.getMessage());
if (UiUtils.isLandscape(mFrame.getContext()))
open();
@ -110,6 +101,30 @@ final class BannerController implements View.OnClickListener
.add("state:", "0"));
}
private void setLabelSafely(@Nullable TextView label, @Nullable String labelId)
{
if (label == null)
return;
if (TextUtils.isEmpty(labelId))
{
Crashlytics.logException(new Resources.NotFoundException("An empty string id obtained for: "
+ mBanner));
return;
}
try
{
String packageName = mFrame.getContext().getPackageName();
String value = mResources.getString(mResources.getIdentifier(labelId, "string", packageName));
label.setText(value);
}
catch (Resources.NotFoundException e)
{
Crashlytics.logException(new IllegalStateException("Unknown banner is found: " + mBanner, e));
}
}
boolean isShowing()
{
return !UiUtils.isHidden(mFrame);