[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: clean up empty string checks
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340687 ) Change subject: Hygiene: clean up empty string checks .. Hygiene: clean up empty string checks Replace calls to StringUtils.defaultString(String).equals("") with isEmpty(), fix nullity concern in WikipediaZeroHandler.onHeaderCheck(), and replace call to defaultString(String, "") with defaultString(String) Bug: T156917 Change-Id: I43fd286f80dc702e2fe04d22a7f9e46e17ad --- M app/src/main/java/org/wikipedia/login/User.java M app/src/main/java/org/wikipedia/util/UriUtil.java M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java 3 files changed, 7 insertions(+), 6 deletions(-) Approvals: Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/org/wikipedia/login/User.java b/app/src/main/java/org/wikipedia/login/User.java index 8a739fe..9d70799 100644 --- a/app/src/main/java/org/wikipedia/login/User.java +++ b/app/src/main/java/org/wikipedia/login/User.java @@ -90,7 +90,7 @@ } @NonNull public String getUserIDLang() { -return StringUtils.defaultString(userIDLang, ""); +return StringUtils.defaultString(userIDLang); } public void setUserID(int id) { diff --git a/app/src/main/java/org/wikipedia/util/UriUtil.java b/app/src/main/java/org/wikipedia/util/UriUtil.java index cbea387..618f4e9 100644 --- a/app/src/main/java/org/wikipedia/util/UriUtil.java +++ b/app/src/main/java/org/wikipedia/util/UriUtil.java @@ -8,6 +8,7 @@ import android.support.annotation.VisibleForTesting; import android.text.TextUtils; +import org.apache.commons.lang3.StringUtils; import org.wikipedia.WikipediaApp; import org.wikipedia.page.PageTitle; import org.wikipedia.settings.Prefs; @@ -17,7 +18,6 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import static org.apache.commons.lang3.StringUtils.defaultString; import static org.wikipedia.zero.WikipediaZeroHandler.showZeroExitInterstitialDialog; public final class UriUtil { @@ -84,7 +84,7 @@ .getWikipediaZeroHandler(); if (!zeroHandler.isZeroEnabled()) { -if (!defaultString(zeroHandler.getXCarrier()).equals("")) { +if (!StringUtils.isEmpty(zeroHandler.getXCarrier())) { // User is potentially zero-rated based on IP, but not on a whitelisted wiki (this // is rare) zeroHandler.getZeroFunnel().logExtLink(); diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java index f9f537a..bb5c5f3 100644 --- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java +++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java @@ -18,6 +18,7 @@ import android.support.v7.app.AlertDialog; import android.support.v7.app.NotificationCompat; +import org.apache.commons.lang3.StringUtils; import org.mediawiki.api.json.ApiResult; import org.mediawiki.api.json.OnHeaderCheckListener; import org.wikipedia.R; @@ -98,9 +99,9 @@ final Uri customPartnerInfoUrl = zeroConfig.getPartnerInfoUrl(); AlertDialog.Builder alert = new AlertDialog.Builder(context); -alert.setTitle(!(defaultString(customExitTitle).equals("")) ? customExitTitle +alert.setTitle(!StringUtils.isEmpty(customExitTitle) ? customExitTitle : context.getString(R.string.zero_interstitial_title)); -alert.setMessage(!(defaultString(customExitWarning).equals("")) ? customExitWarning +alert.setMessage(!StringUtils.isEmpty(customExitWarning) ? customExitWarning : context.getString(R.string.zero_interstitial_leave_app)); alert.setPositiveButton(context.getString(R.string.zero_interstitial_continue), new DialogInterface.OnClickListener() { @@ -174,7 +175,7 @@ } if (xCarrierFromHeader != null) { if (eitherChanged(xCarrierFromHeader, xCarrierMetaFromHeader)) { -identifyZeroCarrier(xCarrierFromHeader, xCarrierMetaFromHeader); +identifyZeroCarrier(xCarrierFromHeader, StringUtils.defaultString(xCarrierMetaFromHeader)); } } else if (zeroEnabled) { zeroOff(); -- To view, visit https://gerrit.wikimedia.org/r/340687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43fd286f80dc702e2fe04d22a7f9e46e17ad Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski Gerrit-Reviewer: Brion VIBBER Gerrit-Reviewer: Dbrant Gerrit-Reviewer: Mholloway Gerrit-Reviewer: Sniedzielski Gerrit-Reviewer: jenkins-bot <> ___ Me
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: clean up empty string checks
Niedzielski has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340687 ) Change subject: Hygiene: clean up empty string checks .. Hygiene: clean up empty string checks Replace calls to StringUtils.defaultString(String).equals("") with isEmpty(), fix nullity concern in WikipediaZeroHandler.onHeaderCheck(), and replace call to defaultString(String, "") with defaultString(String) Bug: T156917 Change-Id: I43fd286f80dc702e2fe04d22a7f9e46e17ad --- M app/src/main/java/org/wikipedia/login/User.java M app/src/main/java/org/wikipedia/util/UriUtil.java M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/87/340687/1 diff --git a/app/src/main/java/org/wikipedia/login/User.java b/app/src/main/java/org/wikipedia/login/User.java index 8a739fe..9d70799 100644 --- a/app/src/main/java/org/wikipedia/login/User.java +++ b/app/src/main/java/org/wikipedia/login/User.java @@ -90,7 +90,7 @@ } @NonNull public String getUserIDLang() { -return StringUtils.defaultString(userIDLang, ""); +return StringUtils.defaultString(userIDLang); } public void setUserID(int id) { diff --git a/app/src/main/java/org/wikipedia/util/UriUtil.java b/app/src/main/java/org/wikipedia/util/UriUtil.java index cbea387..618f4e9 100644 --- a/app/src/main/java/org/wikipedia/util/UriUtil.java +++ b/app/src/main/java/org/wikipedia/util/UriUtil.java @@ -8,6 +8,7 @@ import android.support.annotation.VisibleForTesting; import android.text.TextUtils; +import org.apache.commons.lang3.StringUtils; import org.wikipedia.WikipediaApp; import org.wikipedia.page.PageTitle; import org.wikipedia.settings.Prefs; @@ -17,7 +18,6 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import static org.apache.commons.lang3.StringUtils.defaultString; import static org.wikipedia.zero.WikipediaZeroHandler.showZeroExitInterstitialDialog; public final class UriUtil { @@ -84,7 +84,7 @@ .getWikipediaZeroHandler(); if (!zeroHandler.isZeroEnabled()) { -if (!defaultString(zeroHandler.getXCarrier()).equals("")) { +if (!StringUtils.isEmpty(zeroHandler.getXCarrier())) { // User is potentially zero-rated based on IP, but not on a whitelisted wiki (this // is rare) zeroHandler.getZeroFunnel().logExtLink(); diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java index f9f537a..bb5c5f3 100644 --- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java +++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java @@ -18,6 +18,7 @@ import android.support.v7.app.AlertDialog; import android.support.v7.app.NotificationCompat; +import org.apache.commons.lang3.StringUtils; import org.mediawiki.api.json.ApiResult; import org.mediawiki.api.json.OnHeaderCheckListener; import org.wikipedia.R; @@ -98,9 +99,9 @@ final Uri customPartnerInfoUrl = zeroConfig.getPartnerInfoUrl(); AlertDialog.Builder alert = new AlertDialog.Builder(context); -alert.setTitle(!(defaultString(customExitTitle).equals("")) ? customExitTitle +alert.setTitle(!StringUtils.isEmpty(customExitTitle) ? customExitTitle : context.getString(R.string.zero_interstitial_title)); -alert.setMessage(!(defaultString(customExitWarning).equals("")) ? customExitWarning +alert.setMessage(!StringUtils.isEmpty(customExitWarning) ? customExitWarning : context.getString(R.string.zero_interstitial_leave_app)); alert.setPositiveButton(context.getString(R.string.zero_interstitial_continue), new DialogInterface.OnClickListener() { @@ -174,7 +175,7 @@ } if (xCarrierFromHeader != null) { if (eitherChanged(xCarrierFromHeader, xCarrierMetaFromHeader)) { -identifyZeroCarrier(xCarrierFromHeader, xCarrierMetaFromHeader); +identifyZeroCarrier(xCarrierFromHeader, StringUtils.defaultString(xCarrierMetaFromHeader)); } } else if (zeroEnabled) { zeroOff(); -- To view, visit https://gerrit.wikimedia.org/r/340687 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43fd286f80dc702e2fe04d22a7f9e46e17ad Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski Gerrit-Reviewer: Sniedzielski ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailma