r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix null issues with bitmap

Browse Source
This commit is contained in:
Anthony Restaino 2016-01-27 23:25:34 -05:00
parent 8f38b91dc1
commit ff3d94635a
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/acr/browser/lightning/view/LightningViewTitle.java
View File

@ -16,16 +16,16 @@ import acr.browser.lightning.utils.Utils;
*/
class LightningViewTitle {
private static Bitmap DEFAULT_ICON = null;
@Nullable private static Bitmap DEFAULT_ICON;
@NonNull private final Bitmap mDefault;
@NonNull private Bitmap mFavicon;
@NonNull private String mTitle;
public LightningViewTitle(@NonNull Context context, boolean darkTheme) {
if (DEFAULT_ICON == null) {
DEFAULT_ICON = ThemeUtils.getThemedBitmap(context, R.drawable.ic_webpage, darkTheme);
}
mFavicon = DEFAULT_ICON;
DEFAULT_ICON = getDefault(context, darkTheme);
mDefault = DEFAULT_ICON;
mFavicon = mDefault;
mTitle = context.getString(R.string.action_new_tab);
}
@ -37,12 +37,27 @@ class LightningViewTitle {
*/
public void setFavicon(@Nullable Bitmap favicon) {
if (favicon == null) {
mFavicon = DEFAULT_ICON;
mFavicon = mDefault;
} else {
mFavicon = Utils.padFavicon(favicon);
}
}
/**
* Helper method to initialize the DEFAULT_ICON variable.
*
* @param context the context needed to initialize the Bitmap.
* @param darkTheme whether the icon should be themed dark or not.
* @return a not null icon.
*/
@NonNull
private static Bitmap getDefault(@NonNull Context context, boolean darkTheme) {
if (DEFAULT_ICON == null) {
DEFAULT_ICON = ThemeUtils.getThemedBitmap(context, R.drawable.ic_webpage, darkTheme);
}
return DEFAULT_ICON;
}
/**
* Set the current title to a new title.
* Must not be null.