Bump to next release 1.2, update Gradle stuff, add option to only notify on (You)s, fix crash if tracked reply id isn't a number somehow

Author: Gunbard

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Sep 03 13:24:27 CDT 2020
+#Sat Jun 05 18:51:26 CDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

theadwatch/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "honkhonk.threadwatch"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 3
-        versionName "1.1.0"
+        versionCode 4
+        versionName "1.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -28,11 +28,11 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'com.android.volley:volley:1.1.0'
+    implementation 'com.android.volley:volley:1.2.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     testImplementation 'junit:junit:4.12'
 }

theadwatch/src/main/java/honkhonk/threadwatch/activities/MainActivity.java

@@ -297,6 +297,12 @@ public void onCreateContextMenu(ContextMenu menu, View v,
                 getResources().getString(R.string.thread_menu_enabled);
         toggleItem.setTitle(toggleText);
 
+        MenuItem youToggleItem = menu.findItem(R.id.thread_menu_notify_you_toggle);
+        final String youToggleText = thread.notifyOnlyIfRepliesToYou ?
+                getResources().getString(R.string.thread_menu_notify_you_enabled) :
+                getResources().getString(R.string.thread_menu_notify_you_disabled);
+        youToggleItem.setTitle(youToggleText);
+
         // Set delete button color
         MenuItem deleteButton = menu.findItem(R.id.thread_menu_delete);
         SpannableString s = new SpannableString(deleteButton.getTitle());
@@ -319,6 +325,11 @@ public boolean onContextItemSelected(MenuItem item) {
                 ThreadDataManager.updateThread(MainActivity.this, thread);
                 refreshList();
                 return true;
+            case R.id.thread_menu_notify_you_toggle:
+                thread.notifyOnlyIfRepliesToYou = !thread.notifyOnlyIfRepliesToYou;
+                ThreadDataManager.updateThread(MainActivity.this, thread);
+                refreshList();
+                return true;
             case R.id.thread_menu_replies:
                 showThreadReplies(info.position);
                 return true;
@@ -711,8 +722,8 @@ private void addThread(final String threadUrl) {
         String replyId = null;
         String urlFragment = url.getEncodedFragment();
         if (urlFragment != null) {
-            // Discard first letter, which can be a 'p' or 'q'
-            replyId = urlFragment.substring(1);
+            // Discard non-numbers since the first letter can be a 'p' or 'q'
+            replyId = urlFragment.replaceAll("\\D+","");
         }
 
         final int dupeThreadIndex = getThreadIndex(board, id);

theadwatch/src/main/java/honkhonk/threadwatch/jobs/FetcherJobService.java

@@ -128,6 +128,15 @@ public void threadsRetrieved(final ArrayList<ThreadModel> threads) {
         int newThreadCount = 0;
         for (final ThreadModel thread : threads) {
             if (thread.newReplyCount > 0 && !thread.disabled && thread.replyCountDelta > 0) {
+                // Bypass notification if user only cares about (You)s, but
+                // only if there are (You)s/tracked replies. Otherwise, no notifications will come
+                // through since the user isn't tracking any replies.
+                if (!thread.replyIds.isEmpty() &&
+                    (thread.notifyOnlyIfRepliesToYou && !thread.newRepliesToYou))
+                {
+                    continue;
+                }
+
                 updatedThreadsText.append(thread.getTruncatedTitle());
                 updatedThreadsText.append(" (+");
 
@@ -153,7 +162,8 @@ public void threadsRetrieved(final ArrayList<ThreadModel> threads) {
         // Save for persistence
         ThreadDataManager.setUpdatedThreads(this, updatedThreads);
 
-        if (updatedThreads.size() == 0) {
+        // Only notify if the notification was populated
+        if (updatedThreads.size() == 0 || newThreadCount == 0) {
             return;
         }
 

theadwatch/src/main/java/honkhonk/threadwatch/models/ThreadModel.java

@@ -91,6 +91,11 @@ public class ThreadModel {
      */
     public boolean newRepliesToYou;
 
+    /**
+     * Whether or not to notify only if the thread has new replies to (you)
+     */
+    public boolean notifyOnlyIfRepliesToYou;
+
     /**
      * The UNIX timestamp (in seconds) of when the thread was made
      */

theadwatch/src/main/java/honkhonk/threadwatch/retrievers/ThreadsRetriever.java

@@ -220,9 +220,17 @@ private void retrieveReplyComments(Context context, ThreadModel thread, final Ar
         // Mark posts that weren't found
         for (String replyId : thread.replyIds.keySet()) {
             ArrayList<PostModel> replyComments = thread.replyIds.get(replyId);
-            if (replyComments == null || replyComments.size() == 0) {
+
+            int postNumber = 0;
+            try {
+                postNumber = Integer.parseInt(replyId);
+            } catch (NumberFormatException e) {
+                Log.i(TAG, String.format("Reply Id (%s) was not a post number!", replyId));
+            }
+
+            if (postNumber != 0 && replyComments == null || replyComments.size() == 0) {
                 PostModel failedPost = new PostModel();
-                failedPost.number = Integer.parseInt(replyId);
+                failedPost.number = postNumber;
                 failedPost.comment = context.getString(R.string.reply_not_found);
                 failedPost.failed = true;
 

theadwatch/src/main/res/menu/thread_action_menu.xml

@@ -2,6 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/thread_menu_notify_toggle"
         android:title=""/>
+    <item android:id="@+id/thread_menu_notify_you_toggle"
+        android:title=""/>
     <item android:id="@+id/thread_menu_replies"
         android:title="@string/thread_menu_replies"/>
     <item android:id="@+id/thread_menu_info"

theadwatch/src/main/res/values/strings.xml

@@ -41,6 +41,8 @@
     <string name="thread_menu_info">Info</string>
     <string name="thread_menu_disabled">Thread refresh: Disabled</string>
     <string name="thread_menu_enabled">Thread refresh: Enabled</string>
+    <string name="thread_menu_notify_you_disabled">Only notify on (You): Disabled</string>
+    <string name="thread_menu_notify_you_enabled">Only notify on (You): Enabled</string>
     <string name="thread_menu_mark_read">Mark as Read</string>
     <string name="thread_menu_delete">Delete</string>
     <string name="thread_menu_deleted">Deleted</string>