organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[Android] A crash in com.mapswithme.util.ThemeUtils.isValidTheme(ThemeUtils.java:82) #113 #150

Closed
Alteyaa wants to merge 1 commit from OMPS-19 into master
pull from: OMPS-19
merge into: organicmaps:master
Conversation 1 Commits 1 Files changed 1 +10 -4
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
android/src/com/mapswithme/util/ThemeUtils.java
View file

@ -10,6 +10,8 @@ import android.util.TypedValue;
import com.mapswithme.maps.R;
import java.util.Objects;
public final class ThemeUtils
{
private static final TypedValue VALUE_BUFFER = new TypedValue();
@ -79,10 +81,14 @@ public final class ThemeUtils
public static boolean isValidTheme(@NonNull Context context, String theme)
{
String defaultTheme = context.getString(R.string.theme_default);
String nightTheme = context.getString(R.string.theme_night);
return (defaultTheme.equals(theme) || nightTheme.equals(theme));
}
if (context == null) {
throw new NullPointerException("context is marked @NonNull but is null");
}
String defaultTheme = context.getString(R.string.theme_default);
String nightTheme = context.getString(R.string.theme_night);
return (defaultTheme.equals(theme) || nightTheme.equals(theme));
}
@StyleRes
public static int getCardBgThemeResourceId(@NonNull Context context, @NonNull String theme)