Cooltey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399316 )
Change subject: Add Notification Channel ID to Notification builder
......................................................................
Add Notification Channel ID to Notification builder
- Add channel IDs to prevent notification fails
- Update some codes to lambda
Change-Id: I5569d10b89ae9adf1ee8604356c77e7633ee7c46
---
M app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
M app/src/main/java/org/wikipedia/notifications/NotificationPresenter.java
M app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
3 files changed, 46 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/16/399316/1
diff --git
a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
index 5fd7028..add2872 100644
--- a/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
+++ b/app/src/main/java/org/wikipedia/alphaupdater/AlphaUpdateChecker.java
@@ -30,6 +30,7 @@
private static final String PREFERENCE_KEY_ALPHA_COMMIT =
"alpha_last_checked_commit";
private static final String ALPHA_BUILD_APK_URL =
"https://android-builds.wmflabs.org/runs/latest/wikipedia.apk";;
private static final String ALPHA_BUILD_DATA_URL =
"https://android-builds.wmflabs.org/runs/latest/meta.json";;
+ private static final String CHANNEL_ID = "ALPHA_UPDATE_CHECKER_CHANNEL";
@NonNull private final Context context;
public AlphaUpdateChecker(@NonNull Context context) {
@@ -72,7 +73,7 @@
Intent intent = new Intent(Intent.ACTION_VIEW,
Uri.parse(ALPHA_BUILD_APK_URL));
PendingIntent pintent = PendingIntent.getActivity(context, 0, intent,
0);
- NotificationCompat.Builder notificationBuilder = new
NotificationCompat.Builder(context)
+ NotificationCompat.Builder notificationBuilder = new
NotificationCompat.Builder(context, CHANNEL_ID)
.setContentTitle(context.getString(R.string.alpha_update_notification_title))
.setContentText(context.getString(R.string.alpha_update_notification_text))
.setContentIntent(pintent)
diff --git
a/app/src/main/java/org/wikipedia/notifications/NotificationPresenter.java
b/app/src/main/java/org/wikipedia/notifications/NotificationPresenter.java
index 2ac0222..2388e36 100644
--- a/app/src/main/java/org/wikipedia/notifications/NotificationPresenter.java
+++ b/app/src/main/java/org/wikipedia/notifications/NotificationPresenter.java
@@ -25,6 +25,7 @@
private static final int REQUEST_CODE_PAGE = 0;
private static final int REQUEST_CODE_HISTORY = 1;
private static final int REQUEST_CODE_AGENT = 2;
+ private static final String CHANNEL_ID = "GENERAL_CHANNEL";
public static void showNotification(@NonNull Context context, Notification
n) {
@StringRes int title;
@@ -46,7 +47,7 @@
ShareUtil.createChooserIntent(new Intent(Intent.ACTION_VIEW,
agentUri), null,
context), PendingIntent.FLAG_UPDATE_CURRENT);
- NotificationCompat.Builder builder = new
NotificationCompat.Builder(context)
+ NotificationCompat.Builder builder = new
NotificationCompat.Builder(context, CHANNEL_ID)
.setDefaults(NotificationCompat.DEFAULT_ALL)
.setPriority(NotificationCompat.PRIORITY_HIGH)
.setAutoCancel(true);
diff --git a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
index ee95145..fd984ce 100644
--- a/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
+++ b/app/src/main/java/org/wikipedia/zero/WikipediaZeroHandler.java
@@ -35,6 +35,7 @@
import static org.wikipedia.util.UriUtil.visitInExternalBrowser;
public class WikipediaZeroHandler {
+ private static final String CHANNEL_ID = "WIKIPEDIA_ZERO_CHANNEL";
private static final int NOTIFICATION_ID = 100;
private static final int MESSAGE_ZERO_CS = 1;
@@ -98,28 +99,17 @@
: context.getString(R.string.zero_interstitial_title));
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() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- visitInExternalBrowser(context, uri);
- zeroHandler.getZeroFunnel().logExtLinkConf();
- }
+
alert.setPositiveButton(context.getString(R.string.zero_interstitial_continue),
(DialogInterface dialog, int id) -> {
+ visitInExternalBrowser(context, uri);
+ zeroHandler.getZeroFunnel().logExtLinkConf();
});
if (customPartnerInfoText != null && customPartnerInfoUrl != null) {
- alert.setNeutralButton(customPartnerInfoText, new
DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
+ alert.setNeutralButton(customPartnerInfoText, (DialogInterface
dialog, int which) -> {
visitInExternalBrowser(context, customPartnerInfoUrl);
- }
});
}
-
alert.setNegativeButton(context.getString(R.string.zero_interstitial_cancel),
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- zeroHandler.getZeroFunnel().logExtLinkBack();
- }
+
alert.setNegativeButton(context.getString(R.string.zero_interstitial_cancel),
(DialogInterface dialog, int id) -> {
+ zeroHandler.getZeroFunnel().logExtLinkBack();
});
AlertDialog ad = alert.create();
ad.show();
@@ -163,14 +153,10 @@
.setTitle(R.string.zero_wikipedia_zero_heading)
.setMessage(R.string.zero_learn_more)
.setPositiveButton(R.string.zero_learn_more_dismiss, null)
- .setNegativeButton(R.string.zero_learn_more_learn_more,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int
id) {
- visitInExternalBrowser(app,
-
(Uri.parse(app.getString(R.string.zero_webpage_url))));
- zeroFunnel.logExtLinkMore();
- }
+ .setNegativeButton(R.string.zero_learn_more_learn_more,
(DialogInterface dialog, int id) -> {
+ visitInExternalBrowser(app,
+
(Uri.parse(app.getString(R.string.zero_webpage_url))));
+ zeroFunnel.logExtLinkMore();
}).create().show();
}
@@ -180,44 +166,41 @@
private void identifyZeroCarrier(@NonNull final String xCarrierFromHeader,
@NonNull final String
xCarrierMetaFromHeader) {
- Handler wikipediaZeroHandler = new Handler(new Handler.Callback() {
- @Override
- public boolean handleMessage(Message msg) {
- new ZeroConfigClient().request(new
WikiSite(app.getWikiSite().mobileAuthority()),
- app.getUserAgent(), new ZeroConfigClient.Callback() {
- @Override
- public void success(@NonNull Call<ZeroConfig> call,
@NonNull ZeroConfig config) {
- L.i("New Wikipedia Zero config: " + config);
+ Handler wikipediaZeroHandler = new Handler((Message msg) -> {
+ new ZeroConfigClient().request(new
WikiSite(app.getWikiSite().mobileAuthority()),
+ app.getUserAgent(), new ZeroConfigClient.Callback() {
+ @Override
+ public void success(@NonNull Call<ZeroConfig> call, @NonNull
ZeroConfig config) {
+ L.i("New Wikipedia Zero config: " + config);
- if (!config.isEligible()) {
- acquiringCarrierMessage = false;
- return;
- }
-
- xCarrier = xCarrierFromHeader; // ex. "123-45"
- zeroCarrierString = xCarrierFromHeader;
- zeroCarrierMetaString = xCarrierMetaFromHeader; // ex.
"wap"; default ""
- zeroConfig = config;
- zeroEnabled = true;
- zeroFunnel = new WikipediaZeroUsageFunnel(app,
zeroCarrierString,
- defaultString(zeroCarrierMetaString));
- app.getBus().post(new WikipediaZeroEnterEvent());
- if (zeroConfig.hashCode() !=
Prefs.zeroConfigHashCode()) {
- notifyEnterZeroNetwork(app, zeroConfig);
- }
- Prefs.zeroConfigHashCode(zeroConfig.hashCode());
+ if (!config.isEligible()) {
acquiringCarrierMessage = false;
+ return;
}
- @Override
- public void failure(@NonNull Call<ZeroConfig> call,
@NonNull Throwable caught) {
- L.w("Wikipedia Zero eligibility check failed", caught);
- acquiringCarrierMessage = false;
+ xCarrier = xCarrierFromHeader; // ex. "123-45"
+ zeroCarrierString = xCarrierFromHeader;
+ zeroCarrierMetaString = xCarrierMetaFromHeader; // ex.
"wap"; default ""
+ zeroConfig = config;
+ zeroEnabled = true;
+ zeroFunnel = new WikipediaZeroUsageFunnel(app,
zeroCarrierString,
+ defaultString(zeroCarrierMetaString));
+ app.getBus().post(new WikipediaZeroEnterEvent());
+ if (zeroConfig.hashCode() != Prefs.zeroConfigHashCode()) {
+ notifyEnterZeroNetwork(app, zeroConfig);
}
- });
- acquiringCarrierMessage = true;
- return true;
- }
+ Prefs.zeroConfigHashCode(zeroConfig.hashCode());
+ acquiringCarrierMessage = false;
+ }
+
+ @Override
+ public void failure(@NonNull Call<ZeroConfig> call, @NonNull
Throwable caught) {
+ L.w("Wikipedia Zero eligibility check failed", caught);
+ acquiringCarrierMessage = false;
+ }
+ });
+ acquiringCarrierMessage = true;
+ return true;
});
wikipediaZeroHandler.removeMessages(MESSAGE_ZERO_CS);
@@ -275,7 +258,7 @@
}
private NotificationCompat.Builder createNotification(@NonNull Context
context) {
- return (NotificationCompat.Builder) new
NotificationCompat.Builder(context)
+ return new NotificationCompat.Builder(context, CHANNEL_ID)
.setDefaults(NotificationCompat.DEFAULT_ALL)
.setPriority(NotificationCompat.PRIORITY_MAX)
.setContentTitle(context.getString(R.string.zero_wikipedia_zero_heading))
--
To view, visit https://gerrit.wikimedia.org/r/399316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5569d10b89ae9adf1ee8604356c77e7633ee7c46
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
