diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java index 0d222f881..5da032317 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java +++ b/app/src/main/java/com/hippo/ehviewer/client/EhTagDatabase.java @@ -145,8 +145,13 @@ public class EhTagDatabase { private static Lock lock = new ReentrantLock(); @Nullable - public static EhTagDatabase getInstance() { - return instance; + public static EhTagDatabase getInstance(Context context) { + if (isPossible(context)) { + return instance; + } else { + instance = null; + return null; + } } @Nullable diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index dab338c3a..cf38c45b6 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -869,7 +869,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mNoTags.setVisibility(View.GONE); } - EhTagDatabase ehTags = Settings.getShowTagTranslations() ? EhTagDatabase.getInstance() : null; + EhTagDatabase ehTags = Settings.getShowTagTranslations() ? EhTagDatabase.getInstance(context) : null; int colorTag = AttrResources.getAttrColor(context, R.attr.tagBackgroundColor); int colorName = AttrResources.getAttrColor(context, R.attr.tagGroupBackgroundColor); for (GalleryTagGroup tg : tagGroups) {