Brion VIBBER has submitted this change and it was merged.

Change subject: Don't count blocks as empty if they have comments in them
......................................................................


Don't count blocks as empty if they have comments in them

Bug: 63742
Change-Id: I62b303a3104101c9c80d95e1101ea22b4b0d2f95
---
M checkstyle.xml
M wikipedia/src/main/java/org/wikipedia/networking/ConnectionChangeReceiver.java
2 files changed, 3 insertions(+), 10 deletions(-)

Approvals:
  Brion VIBBER: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/checkstyle.xml b/checkstyle.xml
index af80807..a87d83e 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -116,7 +116,9 @@
         <!-- Checks for blocks. You know, those {}'s         -->
         <!-- See http://checkstyle.sf.net/config_blocks.html -->
         <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>
+        </module>
         <module name="LeftCurly"/>
         <module name="NeedBraces"/>
         <module name="RightCurly"/>
diff --git 
a/wikipedia/src/main/java/org/wikipedia/networking/ConnectionChangeReceiver.java
 
b/wikipedia/src/main/java/org/wikipedia/networking/ConnectionChangeReceiver.java
index 19c5140..3f528c0 100644
--- 
a/wikipedia/src/main/java/org/wikipedia/networking/ConnectionChangeReceiver.java
+++ 
b/wikipedia/src/main/java/org/wikipedia/networking/ConnectionChangeReceiver.java
@@ -40,15 +40,6 @@
                     public boolean handleMessage(Message msg) {
                         RandomArticleIdTask randomTask = new 
RandomArticleIdTask(app.getAPIForSite(app.getPrimarySite()), 
app.getPrimarySite(), context) {
                             @Override
-                            public void onFinish(PageTitle title) {
-                                Log.d("Wikipedia", "Random article title 
pulled: " + title);
-
-                                if (title != null) {
-                                    // future state, let's persist this 
somewhere to make Random work snappily
-                                }
-                            }
-
-                            @Override
                             public void onCatch(Throwable caught) {
                                 // oh snap
                                 Log.d("Wikipedia", "Random article ID 
retrieval failed");

-- 
To view, visit https://gerrit.wikimedia.org/r/126128
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62b303a3104101c9c80d95e1101ea22b4b0d2f95
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to