Bump version to 2.26.3

// FREEBIE

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="148"
-      android:versionName="2.26.2">
+      android:versionCode="149"
+      android:versionName="2.26.3">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
 

src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java

@@ -66,7 +66,7 @@ public class DatabaseUpgradeActivity extends BaseActivity {
   public static final int PUSH_DECRYPT_SERIAL_ID_VERSION       = 131;
   public static final int MIGRATE_SESSION_PLAINTEXT            = 136;
   public static final int CONTACTS_ACCOUNT_VERSION             = 136;
-  public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 146;
+  public static final int MEDIA_DOWNLOAD_CONTROLS_VERSION      = 149;
 
   private static final SortedSet<Integer> UPGRADE_VERSIONS = new TreeSet<Integer>() {{
     add(NO_MORE_KEY_EXCHANGE_PREFIX_VERSION);

src/org/thoughtcrime/securesms/components/ThumbnailView.java

@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.NonNull;
@@ -79,6 +78,9 @@ public class ThumbnailView extends FrameLayout {
     progress       = (ProgressWheel) findViewById(R.id.progress_wheel);
     downloadButton = (ImageButton)   findViewById(R.id.download_button);
 
+    setOnClickListener(new ThumbnailClickDispatcher());
+    downloadButton.setOnClickListener(new DownloadClickDispatcher());
+
     if (attrs != null) {
       TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.ThumbnailView, 0, 0);
       backgroundColorHint = typedArray.getColor(0, Color.BLACK);
@@ -184,12 +186,6 @@ public class ThumbnailView extends FrameLayout {
 
     this.slide = slide;
     buildGlideRequest(slide, masterSecret).into(image);
-    if (this.slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_DONE) {
-      setOnClickListener(new ThumbnailClickDispatcher(thumbnailClickListener, slide));
-    } else {
-      setOnClickListener(null);
-    }
-    downloadButton.setOnClickListener(new ThumbnailClickDispatcher(downloadClickListener, slide));
   }
 
   public void setThumbnailClickListener(ThumbnailClickListener listener) {
@@ -332,20 +328,23 @@ public class ThumbnailView extends FrameLayout {
     void onClick(View v, Slide slide);
   }
 
-  private static class ThumbnailClickDispatcher implements View.OnClickListener {
-    private ThumbnailClickListener listener;
-    private Slide                  slide;
-
-    public ThumbnailClickDispatcher(ThumbnailClickListener listener, Slide slide) {
-      this.listener = listener;
-      this.slide    = slide;
-    }
-
+  private class ThumbnailClickDispatcher implements View.OnClickListener {
     @Override
     public void onClick(View view) {
-      if (listener != null)
+      if (thumbnailClickListener != null &&
+          slide                  != null &&
+          slide.getTransferProgress() == PartDatabase.TRANSFER_PROGRESS_DONE)
       {
-        listener.onClick(view, slide);
+        thumbnailClickListener.onClick(view, slide);
+      }
+    }
+  }
+
+  private class DownloadClickDispatcher implements View.OnClickListener {
+    @Override
+    public void onClick(View view) {
+      if (downloadClickListener != null && slide != null) {
+        downloadClickListener.onClick(view, slide);
       }
     }
   }

src/org/thoughtcrime/securesms/notifications/MessageNotifier.java

@@ -174,7 +174,10 @@ public class MessageNotifier {
       }
 
       updateBadge(context, notificationState.getMessageCount());
-      scheduleReminder(context, reminderCount);
+
+      if (signal) {
+        scheduleReminder(context, reminderCount);
+      }
     } finally {
       if (telcoCursor != null) telcoCursor.close();
       if (pushCursor != null)  pushCursor.close();