From 9d708b650fbfcdf0b5740145ded5db1136dd4def Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 14:22:22 -0700 Subject: [PATCH 1/6] Switched to proper link to Publisher, per official documentation. --- .../main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index 3b5dace..013dabd 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -66,8 +66,9 @@ public final class AboutBoxUtils { String webURI = null; switch (buildType) { case GOOGLE: - appURI = "market://search?q=pub:" + publisher; - webURI = "http://play.google.com/store/search?q=pub:" + publisher; + // see: https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher + appURI = "market://dev?id=" + publisher; + webURI = "http://play.google.com/store/dev?id=" + publisher; break; case AMAZON: appURI = "amzn://apps/android?showAll=1&p=" + packageName; From 852005c24ed2438cc6f102173b554637d480c9f9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 14:52:44 -0700 Subject: [PATCH 2/6] Fixed home page URL cleaning for display. --- .../java/com/eggheadgames/aboutbox/activity/AboutActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7d292dc..5d12e2b 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/activity/AboutActivity.java @@ -184,7 +184,7 @@ public class AboutActivity extends MaterialAboutActivity { if (!TextUtils.isEmpty(config.webHomePage)) { card.addItem(new MaterialAboutActionItem.Builder() .text(R.string.egab_web_label) - .subText(config.webHomePage.replace("https://", "").replace("http://", "").replace("/", "")) + .subText(config.webHomePage.replaceFirst("^https?://", "").replaceAll("/$", "")) .icon(R.drawable.ic_web_black_24dp) .setOnClickListener(new MaterialAboutItemOnClickListener() { @Override From 0ebb47877189df08556bdc02fc6b8cf8f37ddae3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 15:22:16 -0700 Subject: [PATCH 3/6] Added default shareMessage if not set. --- .../eggheadgames/aboutbox/AboutBoxUtils.java | 7 +++++-- .../aboutbox/share/ShareUtil.java | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index 013dabd..6f4bbf1 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -8,6 +8,9 @@ import android.widget.Toast; public final class AboutBoxUtils { + public static String playStoreAppURI = "https://play.google.com/store/apps/details?id="; + public static String amznStoreAppURI = "https://www.amazon.com/gp/mas/dl/android?p="; + private AboutBoxUtils() { //nothing } @@ -49,11 +52,11 @@ public final class AboutBoxUtils { switch (buildType) { case GOOGLE: appURI = "market://details?id=" + packageName; - webURI = "http://play.google.com/store/apps/details?id=" + packageName; + webURI = playStoreAppURI + packageName; break; case AMAZON: appURI = "amzn://apps/android?p=" + packageName; - webURI = "http://www.amazon.com/gp/mas/dl/android?p=" + packageName; + webURI = amznStoreAppURI + packageName; break; default: //nothing diff --git a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java index 61a4511..716c1ca 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java @@ -2,7 +2,9 @@ package com.eggheadgames.aboutbox.share; import android.app.Activity; import android.content.Intent; +import android.text.TextUtils; +import com.eggheadgames.aboutbox.AboutBoxUtils; import com.eggheadgames.aboutbox.AboutConfig; public final class ShareUtil { @@ -17,7 +19,22 @@ public final class ShareUtil { Intent intent2 = new Intent(); intent2.setAction(Intent.ACTION_SEND); intent2.setType("text/plain"); - intent2.putExtra(Intent.EXTRA_TEXT, config.shareMessage); + + String shareMessage = config.shareMessage; + + if (!TextUtils.isEmpty(config.packageName) && !TextUtils.isEmpty(shareMessage) && config.buildType != null) { + switch (config.buildType) { + case GOOGLE: + shareMessage = AboutBoxUtils.playStoreAppURI + config.packageName; + break; + case AMAZON: + shareMessage = AboutBoxUtils.amznStoreAppURI + config.packageName; + break; + } + } + + intent2.putExtra(Intent.EXTRA_TEXT, shareMessage); + activity.startActivity(Intent.createChooser(intent2, config.sharingTitle)); } } From 134ebebb61605e03a1af530eb5c4ce6e01696328 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 21 Aug 2017 23:56:46 -0700 Subject: [PATCH 4/6] Force CircleCI trigger. --- .../src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index 6f4bbf1..fa66e42 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -69,7 +69,7 @@ public final class AboutBoxUtils { String webURI = null; switch (buildType) { case GOOGLE: - // see: https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher + // per: https://developer.android.com/distribute/marketing-tools/linking-to-google-play.html#OpeningPublisher appURI = "market://dev?id=" + publisher; webURI = "http://play.google.com/store/dev?id=" + publisher; break; From 3ae1c381d1e62547bb1f3cc36c2c730d4869ead2 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 00:09:03 -0700 Subject: [PATCH 5/6] Made constants final per FindBugs report. --- .../main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java index fa66e42..fc3f654 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/AboutBoxUtils.java @@ -8,8 +8,8 @@ import android.widget.Toast; public final class AboutBoxUtils { - public static String playStoreAppURI = "https://play.google.com/store/apps/details?id="; - public static String amznStoreAppURI = "https://www.amazon.com/gp/mas/dl/android?p="; + public final static String playStoreAppURI = "https://play.google.com/store/apps/details?id="; + public final static String amznStoreAppURI = "https://www.amazon.com/gp/mas/dl/android?p="; private AboutBoxUtils() { //nothing From 337b7dafb3a9ae838c1d030902568081efb2f09b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 22 Aug 2017 00:23:15 -0700 Subject: [PATCH 6/6] Added default case to switch per PMD report. --- .../main/java/com/eggheadgames/aboutbox/share/ShareUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java index 716c1ca..851ec00 100644 --- a/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java +++ b/library/src/main/java/com/eggheadgames/aboutbox/share/ShareUtil.java @@ -30,6 +30,8 @@ public final class ShareUtil { case AMAZON: shareMessage = AboutBoxUtils.amznStoreAppURI + config.packageName; break; + default: + break; } }