Fix label jotting and subtask bugs

* Make jottings clickable in LabelActivity by calling bindView in RecyclableJottingsListAdapter#onBindViewHolder
* Add or remove strikethrough when request is complete to update the completed property of a subtask

v2.3.1

Author: varunsingh87

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.boruminc.borumjot.android"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 49
-        versionName "2.3.0"
+        versionCode 50
+        versionName "2.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/boruminc/borumjot/android/HelpActivity.java

@@ -2,15 +2,10 @@
 
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
-import android.webkit.WebView;
-import android.widget.Toast;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class HelpActivity extends AppCompatActivity {

app/src/main/java/com/boruminc/borumjot/android/RecyclableJottingsListAdapter.java

@@ -52,7 +52,7 @@ public JottingViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewT
 
     @Override
     public void onBindViewHolder(@NonNull JottingViewHolder holder, int position) {
-        holder.jottingName.setText(jottingData.get(position).getName());
+        holder.bindView(jottingData.get(position));
     }
 
     @Override

app/src/main/java/com/boruminc/borumjot/android/TaskActivity.java

@@ -185,6 +185,14 @@ private void showLabelImageBtn() {
         labelsList.addView(labelControlsBtn, 0);
     }
 
+    private void setSubtask(EditText view, boolean isCompleted) {
+        if (isCompleted)
+            // Add a strikethrough to the already existing paint flags using "|" bitwise operator
+            view.setPaintFlags(view.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+        else
+            view.setPaintFlags(view.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
+    }
+
     /**
      * Loads the subtasks.
      */
@@ -539,13 +547,11 @@ public JSONObject call() {
                     @Override
                     public void onComplete(JSONObject data) {
                         super.onComplete(data);
-                        if (data != null) {
-                            if (data.has("error") || !ranOk()) {
-                                Toast.makeText(getApplicationContext(), "An error occurred and the task could not be marked as "
-                                    + (completed == 1 ? "completed" : "incomplete"), Toast.LENGTH_LONG).show();
-                            } else {
-                                appBarFrag.displayStrikethrough(completed == 1);
-                            }
+                        if (ranOk()) {
+                            appBarFrag.displayStrikethrough(completed == 1);
+                        } else {
+                            Toast.makeText(getApplicationContext(), "An error occurred and the task could not be marked as "
+                                + (completed == 1 ? "completed" : "incomplete"), Toast.LENGTH_LONG).show();
                         }
                     }
                 }
@@ -633,28 +639,25 @@ public JSONObject call() {
                         );
                     }
                 },
-                data -> {
-                    try {
-                        if (data != null) {
-                            if (data.has("error") || data.getInt("statusCode") != 200) {
-                                Toast.makeText(this, "An error occurred and the task could not be marked as "
-                                        + (completed == 1 ? "complete" : "incomplete"), Toast.LENGTH_LONG).show();
-                            } else {
-                                EditText subtaskTxt = (EditText) subtaskRow.getChildAt(1);
-                                // TODO Move into new class/fragment? because same code as in AppNameAppBarFragment
-                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                                    if (completed == 1)
-                                        // Add a strikethrough to the already existing paint flags using "|" bitwise operator
-                                        subtaskTxt.setPaintFlags(subtaskTxt.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
-                                    else
-                                        // Remove the strikethrough from the paint flags using "&" bitwise operator
-                                        subtaskTxt.setPaintFlags(subtaskTxt.getPaintFlags() & (~Paint.STRIKE_THRU_TEXT_FLAG));
-                                }
+                new ApiResponseExecutor() {
+                    @Override
+                    public void onComplete(JSONObject result) {
+                        super.onComplete(result);
+                        if (ranOk()) {
+                            EditText subtaskTxt = (EditText) subtaskRow.getChildAt(1);
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                                if (completed == 1)
+                                    setSubtask(subtaskTxt, true);
+                                else
+                                    setSubtask(subtaskTxt, false);
                             }
+                        } else {
+                            Toast.makeText(
+                                    getApplicationContext(),
+                                    "An error occurred and the task could not be marked as " + (completed == 1 ? "complete" : "incomplete"),
+                                    Toast.LENGTH_LONG
+                            ).show();
                         }
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                        Toast.makeText(this, "A server error occurred. The task was not updated", Toast.LENGTH_SHORT).show();
                     }
                 }
         );

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

@@ -92,7 +92,7 @@
     <string name="delete_content_desc">Trashcan or delete icon</string>
     <string name="save_content_desc">Save icon</string>
     <string name="action_help">Help</string>
-    <string name="version_name">Version 2.3.0</string>
+    <string name="version_name">Version 2.3.1</string>
     <string name="action_labels">Labels</string>
     <string name="copyright_notice">Copyright 2021 Varun Singh</string>
     <string name="support_email">support@borumtech.com</string>