From 6ff27e1170597b09b3310815b6c3bf7f058086b2 Mon Sep 17 00:00:00 2001 From: Alex Dibrivnyi Date: Sun, 5 Feb 2017 20:48:34 +0200 Subject: [PATCH] Fixed PMD --- .idea/misc.xml | 2 +- .../eggheadgames/aboutbox/AboutConfig.java | 22 ++++++++----------- .../aboutbox/activity/AboutActivity.java | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 519d433..93f5422 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,5 +37,5 @@ - + \ No newline at end of file diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java index 8529e3c..490fc95 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutConfig.java @@ -1,20 +1,9 @@ package com.eggheadgames.aboutbox; -import android.content.Context; - public class AboutConfig { public enum BuildType {AMAZON, GOOGLE} - private static AboutConfig aboutConfig; - - public static AboutConfig getInstance() { - if (aboutConfig == null) { - aboutConfig = new AboutConfig(); - } - return aboutConfig; - } - // general info public String appName; public int appIcon; @@ -29,8 +18,7 @@ public class AboutConfig { public String privacyHtmlPath; public String acknowledgmentHtmlPath; public BuildType buildType; - - public Context context; + public String packageName; // custom analytics and dialog public IAnalytic analytics; @@ -46,4 +34,12 @@ public class AboutConfig { public String shareMessage; public String sharingTitle; + public static class SingletonHolder { + public static final AboutConfig HOLDER_INSTANCE = new AboutConfig(); + } + + public static AboutConfig getInstance() { + return SingletonHolder.HOLDER_INSTANCE; + } + } diff --git a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java index 5e1eec1..d2b1b67 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -65,7 +65,7 @@ public class AboutActivity extends MaterialAboutActivity { .setOnClickListener(new MaterialAboutActionItem.OnClickListener() { @Override public void onClick() { - openApp(config.context.getPackageName(), config.buildType == AboutConfig.BuildType.GOOGLE); + openApp(config.packageName, config.buildType == AboutConfig.BuildType.GOOGLE); if (config.analytics != null) { config.analytics.logUiEvent(config.logUiEventName, getString(R.string.review_log_event)); }