Bump version to 3.26.2

// FREEBIE
Include missing cardview dependency
2026-02-20 01:40:56 +00:00 · 2017-01-09 08:00:53 -08:00 · 2017-01-09 07:51:56 -08:00 · 2017-01-08 13:11:48 -08:00 · 2017-01-08 13:06:11 -08:00 · 2017-01-08 10:16:23 -08:00
12 changed files with 85 additions and 226 deletions
--- a/AndroidManifest.xml
+++ b/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="223"
-      android:versionName="3.26.0">
+      android:versionCode="225"
+      android:versionName="3.26.2">

    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview"/>

--- a/build.gradle
+++ b/build.gradle
@@ -38,11 +38,29 @@ repositories {
 }

 dependencies {
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:recyclerview-v7:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:support-v13:25.1.0'
+    compile 'com.android.support:cardview-v7:25.1.0'
+    compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){
+        exclude module: 'support-v4'
+    }
+    compile ('com.android.support:gridlayout-v7:25.1.0') {
+        exclude module: 'support-v4'
+    }
+    compile 'com.android.support:multidex:1.0.1'
+
+    compile 'com.google.android.gms:play-services-gcm:9.6.1'
+    compile 'com.google.android.gms:play-services-maps:9.6.1'
+    compile 'com.google.android.gms:play-services-places:9.6.1'
+
+    compile 'org.whispersystems:jobmanager:1.0.2'
+    compile 'org.whispersystems:libpastelog:1.0.7'
+    compile 'org.whispersystems:signal-service-android:2.4.4'
+
    compile 'me.leolin:ShortcutBadger:1.1.0-WS1'
    compile 'se.emilsjolander:stickylistheaders:2.7.0'
-    compile 'com.google.android.gms:play-services-gcm:8.1.0'
-    compile 'com.google.android.gms:play-services-maps:8.1.0'
-    compile 'com.google.android.gms:play-services-location:8.1.0'
    compile 'com.jpardogo.materialtabstrip:library:1.0.9'
    compile 'org.w3c:smil:1.0.0'
    compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
@@ -53,37 +71,20 @@ dependencies {
    compile 'de.greenrobot:eventbus:2.4.0'
    compile 'pl.tajchert:waitingdots:0.1.0'
    compile 'com.soundcloud.android:android-crop:0.9.10@aar'
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:recyclerview-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile 'com.android.support:cardview-v7:25.1.0'
-    compile 'com.android.support:support-v13:25.1.0'
    compile 'com.melnykov:floatingactionbutton:1.3.0'
    compile 'com.google.zxing:android-integration:3.1.0'
-    compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){
-        exclude module: 'support-v4'
-    }
-    compile ('com.android.support:gridlayout-v7:22.2.0') {
-        exclude module: 'support-v4'
-    }
-
    compile 'com.squareup.dagger:dagger:1.2.2'
    compile ("com.doomonafireball.betterpickers:library:1.5.3") {
        exclude group: 'com.android.support', module: 'support-v4'
    }
    compile 'com.madgag.spongycastle:prov:1.51.0.0'
    provided 'com.squareup.dagger:dagger-compiler:1.2.2'
-
-    compile 'org.whispersystems:jobmanager:1.0.2'
-    compile 'org.whispersystems:libpastelog:1.0.7'
    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'org.whispersystems:signal-service-android:2.4.4'
    compile 'com.h6ah4i.android.compat:mulsellistprefcompat:1.0.0'
    compile 'com.google.zxing:core:3.2.1'
    compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
        exclude group: 'com.android.support', module: 'support-annotations'
    }
-
    compile ('cn.carbswang.android:NumberPickerView:1.0.9') {
        exclude group: 'com.android.support', module: 'appcompat-v7'
    }
@@ -109,11 +110,22 @@ dependencies {

 dependencyVerification {
    verify = [
+        'com.android.support:appcompat-v7:b48bfd5efc14da938ba0647f9894aa7d3d90f0b618167652a318f6f336ef303e',
+        'com.android.support:recyclerview-v7:45beed1778f785c75540b68aa7735b8973a518ac21e8d763188dbbdae6c5b65d',
+        'com.android.support:design:92466557dc6a222bbff361801b26979573cb7086119331e78c74a2df34d5e11e',
+        'com.android.support:support-v13:deeb43c2878025f2a0485791f66b5f59a1c6a4c6671c6ad7bb20abfeffaa313f',
+        'com.android.support:cardview-v7:cd6f472f130a75f029cd1b7c56f72174023d56a2eee2b97577837fe39169d5df',
+        'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',
+        'com.android.support:gridlayout-v7:c24f2aa68089fd31b39811bc502e24637a6a8cc29bbf709cda4f4605047c9e11',
+        'com.android.support:multidex:60df8e7153fabdcf3a6a48a2ce5980b599cf25cbeb3b689b7b615975ca731840',
+        'com.google.android.gms:play-services-gcm:312e61253a236f2d9b750b9c04fc92fd190d23b0b2755c99de6ce4a28b259dae',
+        'com.google.android.gms:play-services-maps:45e8021e7ddac4a44a82a0e9698991389ded3023d35c58f38dbd86d54211ec0e',
+        'com.google.android.gms:play-services-places:abf3a4a3b146ec7e6e753be62775e512868cf37d6f88ffe2d81167b33b57132b',
+        'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
+        'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88',
+        'org.whispersystems:signal-service-android:27f3f686d9d9f855360307b4b641e666246e7b617020e271df66cb4bdcc26f2a',
        'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9',
        'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
-        'com.google.android.gms:play-services-gcm:757ecd2c837ac81c98f4cc7dc783e7454c6d0506f6cc66b10417126b675248c9',
-        'com.google.android.gms:play-services-maps:c58a9d98a98889fb0b27f78100f2d9341ed7722db24ccf832df62b6e8ce1b42e',
-        'com.google.android.gms:play-services-location:8226f778aa86bd15b9143f62425262cc53d64021990f62eb1aaec108d4e25f35',
        'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa',
        'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b',
        'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1',
@@ -124,36 +136,32 @@ dependencyVerification {
        'de.greenrobot:eventbus:61d743a748156a372024d083de763b9e91ac2dcb3f6a1cbc74995c7ddab6e968',
        'pl.tajchert:waitingdots:2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c',
        'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177',
-        'com.android.support:appcompat-v7:b48bfd5efc14da938ba0647f9894aa7d3d90f0b618167652a318f6f336ef303e',
-        'com.android.support:recyclerview-v7:45beed1778f785c75540b68aa7735b8973a518ac21e8d763188dbbdae6c5b65d',
-        'com.android.support:design:92466557dc6a222bbff361801b26979573cb7086119331e78c74a2df34d5e11e',
-        'com.android.support:cardview-v7:cd6f472f130a75f029cd1b7c56f72174023d56a2eee2b97577837fe39169d5df',
-        'com.android.support:support-v13:deeb43c2878025f2a0485791f66b5f59a1c6a4c6671c6ad7bb20abfeffaa313f',
        'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263',
        'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
-        'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad',
-        'com.android.support:gridlayout-v7:a9b770cffca2c7c5cd83cba4dd12503365de5e8d9c79c479165adf18ab3bc25b',
        'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883',
        'com.doomonafireball.betterpickers:library:132ecd685c95a99e7377c4e27bfadbb2d7ed0bea995944060cd62d4369fdaf3d',
        'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
-        'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
-        'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88',
        'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb',
-        'org.whispersystems:signal-service-android:27f3f686d9d9f855360307b4b641e666246e7b617020e271df66cb4bdcc26f2a',
        'com.h6ah4i.android.compat:mulsellistprefcompat:47167c5cb796de1a854788e9ff318358e36c8fb88123baaa6e38fb78511dfabe',
        'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
+        'com.davemorrissey.labs:subsampling-scale-image-view:550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe',
        'cn.carbswang.android:NumberPickerView:18b3c316d62c7c277978a8d4ed57a5b8f4e943762264960f579a8a549c756729',
-        'com.google.android.gms:play-services-base:ef36e50fa5c0415ed41f74dd399a889efd2fa327c449036e140c7c3786aa0e1f',
        'com.android.support:support-annotations:fb941680f43afbd70ce01ec3cc837a5037f0a774701b12a9fd3090bd4727cf15',
+        'com.android.support:support-v4:ed4cda7c752f51d33f9bbdfff3422b425b323d356cd1bdc9786aa413c912e594',
+        'com.android.support:support-vector-drawable:2697503d3e8e709023ae176ba5db7f98ca0aa0b4e6290aedcb3c371904806bf7',
+        'com.android.support:animated-vector-drawable:6d05cb63d1f68900220f85c56dfe1066a9bb19cb0ec1247cc68fc2ba32f6b4a7',
        'com.android.support:support-compat:e880fb1209c33fcb43e2b25716808e1a6e0b4d3170d5a8dc7704e15084428f88',
        'com.android.support:support-core-ui:0149b54fd3bc9f4b3b2d321ff53c11821b31a2eca1e664d0cee224e8f53073d6',
        'com.android.support:transition:cf53f778352fe0b74ff14d838bef9fe79264f3fd43eac499b6e0d1664dbd8997',
+        'com.google.android.gms:play-services-base:0ca636a8fc9a5af45e607cdcd61783bf5d561cbbb0f862021ce69606eee5ad49',
+        'com.google.android.gms:play-services-basement:95dd882c5ffba15b9a99de3fefb05d3a01946623af67454ca00055d222f85a8d',
+        'com.google.android.gms:play-services-iid:54e919f9957b8b7820da7ee9b83471d00d0cac1cf08ddea8b5b41aea80bb1a70',
+        'org.whispersystems:signal-protocol-android:1b4b9d557c8eaf861797ff683990d482d4aa8e9f23d9b17ff0cc67a02f38cb19',
+        'org.whispersystems:signal-service-java:df0e83633ff4078cd276838c8942b953f670c61a5f2615ae2a89c75c19fc1bec',
        'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
        'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
        'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
-        'org.whispersystems:signal-protocol-android:1b4b9d557c8eaf861797ff683990d482d4aa8e9f23d9b17ff0cc67a02f38cb19',
-        'org.whispersystems:signal-service-java:df0e83633ff4078cd276838c8942b953f670c61a5f2615ae2a89c75c19fc1bec',
-        'com.google.android.gms:play-services-basement:e1d29b21e02fd2a63e5a31807415cbb17a59568e27e3254181c01ffae10659bf',
+        'com.google.android.gms:play-services-tasks:69ec265168e601d0203d04cd42e34bb019b2f029aa1e16fabd38a5153eea2086',
        'org.whispersystems:curve25519-android:bf6c34223d45d2f2813a8efcab9923caf99115115c760c9acea680bcb42d23c0',
        'org.whispersystems:signal-protocol-java:a835cd0609cf116a74651bd0aa748db9392bba48c2d2af787757b8a1b50d131c',
        'com.googlecode.libphonenumber:libphonenumber:7214dc6dfc6243e34fb1a3e02ad15331bfff6ab902d679e3ba337695265c21ca',
@@ -164,16 +172,12 @@ dependencyVerification {
        'com.squareup.okio:okio:5e1098bd3fdee4c3347f5ab815b40ba851e4ab1b348c5e49a5b0362f0ce6e978',
        'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94',
        'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0',
-        'com.android.support:support-vector-drawable:2697503d3e8e709023ae176ba5db7f98ca0aa0b4e6290aedcb3c371904806bf7',
-        'com.android.support:animated-vector-drawable:6d05cb63d1f68900220f85c56dfe1066a9bb19cb0ec1247cc68fc2ba32f6b4a7',
-        'com.android.support:support-v4:ed4cda7c752f51d33f9bbdfff3422b425b323d356cd1bdc9786aa413c912e594',
        'com.android.support:support-media-compat:8d6a1a5ba3d9eb1a25cb8f21bb312ac6280202e3d2900cb0b447d065d0d8a125',
        'com.android.support:support-core-utils:a7649e18c04143dde40c218c5ce9a030e7ae674089cd7b18c6cf8ed2a22cf01a',
        'com.android.support:support-fragment:1294500b357f52cf3779e2521c79f54ae7844f3b9a5f6727495dbbda7f231377',
    ]
 }

-
 android {
    compileSdkVersion 25
    buildToolsVersion '23.0.3'
@@ -186,6 +190,7 @@ android {
    defaultConfig {
        minSdkVersion 9
        targetSdkVersion 22
+        multiDexEnabled true

        vectorDrawables.useSupportLibrary = true

--- a/res/layout/contact_selection_activity.xml
+++ b/res/layout/contact_selection_activity.xml
@@ -12,7 +12,8 @@
            android:layout_width="match_parent"
            android:minHeight="?attr/actionBarSize"
            android:background="?attr/colorPrimary"
-            android:theme="?attr/actionBarStyle"/>
+            android:theme="?attr/actionBarStyle"
+            app:contentInsetStartWithNavigation="0dp"/>

        <fragment android:id="@+id/contact_selection_list_fragment"
                  android:layout_width="match_parent"
--- a/res/layout/recent_photo_view_item.xml
+++ b/res/layout/recent_photo_view_item.xml
@@ -9,7 +9,8 @@

    <ImageView android:id="@+id/thumbnail"
               android:layout_width="match_parent"
-               android:layout_height="match_parent"/>
+               android:layout_height="match_parent"
+               android:scaleType="centerCrop"/>

 </org.thoughtcrime.securesms.components.SquareFrameLayout>

--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.os.StrictMode;
 import android.os.StrictMode.ThreadPolicy;
 import android.os.StrictMode.VmPolicy;
+import android.support.multidex.MultiDexApplication;

 import org.thoughtcrime.securesms.crypto.PRNGFixes;
 import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
@@ -54,7 +55,7 @@ import dagger.ObjectGraph;
 *
 * @author Moxie Marlinspike
 */
-public class ApplicationContext extends Application implements DependencyInjector {
+public class ApplicationContext extends MultiDexApplication implements DependencyInjector {

  private ExpiringMessageManager expiringMessageManager;
  private JobManager             jobManager;
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -109,6 +109,7 @@ public class ConversationFragment extends Fragment
    list.setHasFixedSize(false);
    list.setLayoutManager(layoutManager);
    list.addOnScrollListener(scrollListener);
+    list.setItemAnimator(null);

    loadMoreView = inflater.inflate(R.layout.load_more_header, container, false);
    loadMoreView.setOnClickListener(new OnClickListener() {
@@ -171,7 +172,6 @@ public class ConversationFragment extends Fragment
    if (this.recipients != null && this.threadId != -1) {
      list.setAdapter(new ConversationAdapter(getActivity(), masterSecret, locale, selectionClickListener, null, this.recipients));
      getLoaderManager().restartLoader(0, Bundle.EMPTY, this);
-      list.getItemAnimator().setMoveDuration(120);
    }
  }

@@ -236,13 +236,7 @@ public class ConversationFragment extends Fragment
  }

  public void scrollToBottom() {
-    list.getItemAnimator().isRunning(new ItemAnimatorFinishedListener() {
-      @Override
-      public void onAnimationsFinished() {
-        list.stopScroll();
-        list.smoothScrollToPosition(0);
-      }
-    });
+    list.smoothScrollToPosition(0);
  }

  private void handleCopyMessage(final Set<MessageRecord> messageRecords) {
--- a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
@@ -95,7 +95,7 @@ public class ContactFilterToolbar extends Toolbar {
    });

    setLogo(null);
-
+    setContentInsetStartWithNavigation(0);
    expandTapArea(toggleContainer, dialpadToggle);
  }

--- a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
+++ b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
@@ -22,6 +22,7 @@ import android.widget.ImageView;

 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.Key;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.MediaStoreSignature;

 import org.thoughtcrime.securesms.R;
@@ -77,6 +78,8 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo

  private static class RecentPhotoAdapter extends CursorRecyclerViewAdapter<RecentPhotoAdapter.RecentPhotoViewHolder> {

+    private static final String TAG = RecentPhotoAdapter.class.getName();
+
    @NonNull  private final Uri baseUri;
    @Nullable private OnItemClickedListener clickedListener;

@@ -112,7 +115,7 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo
           .fromMediaStore()
           .load(uri)
           .signature(signature)
-           .centerCrop()
+           .diskCacheStrategy(DiskCacheStrategy.NONE)
           .into(viewHolder.imageView);

      viewHolder.imageView.setOnClickListener(new OnClickListener() {
--- a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java
+++ b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java
@@ -86,7 +86,7 @@ public class ZoomingImageView extends FrameLayout {
      }

      protected void onPostExecute(@Nullable Pair<Integer, Integer> dimensions) {
-        Log.w(TAG, "Dimensions: " + dimensions.first + ", " + dimensions.second);
+        Log.w(TAG, "Dimensions: " + (dimensions == null ? "(null)" : dimensions.first + ", " + dimensions.second));

        if (dimensions == null || (dimensions.first <= maxTextureSize && dimensions.second <= maxTextureSize)) {
          Log.w(TAG, "Loading in standard image view...");
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
@@ -112,6 +112,9 @@ public class GiphyActivityToolbar extends Toolbar {
      }
    });

+    setLogo(null);
+    setNavigationIcon(null);
+    setContentInsetStartWithNavigation(0);
    expandTapArea(this, action);
    expandTapArea(toggleContainer, gridToggle);
  }
--- a/src/org/thoughtcrime/securesms/mms/RoundedCorners.java
+++ b/src/org/thoughtcrime/securesms/mms/RoundedCorners.java
@@ -38,19 +38,24 @@ public class RoundedCorners extends BitmapTransformation {
  {
    final Bitmap toRound = crop ? centerCrop(pool, toTransform, outWidth, outHeight)
                                : fitCenter(pool, toTransform, outWidth, outHeight);
+
    final Bitmap rounded = round(pool, toRound);
-    if (toRound != null && toRound != rounded && !pool.put(toRound)) {
+
+    if (toRound != null && toRound != rounded && toRound != toTransform && !pool.put(toRound)) {
      toRound.recycle();
    }
+
    return rounded;
  }

  private Bitmap centerCrop(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
    final Bitmap toReuse     = pool.get(outWidth, outHeight, getSafeConfig(toTransform));
    final Bitmap transformed = TransformationUtils.centerCrop(toReuse, toTransform, outWidth, outHeight);
+
    if (toReuse != null && toReuse != transformed && !pool.put(toReuse)) {
      toReuse.recycle();
    }
+
    return transformed;
  }

@@ -63,28 +68,29 @@ public class RoundedCorners extends BitmapTransformation {
      return null;
    }

-    final Bitmap result;
-    final Bitmap toReuse = pool.get(toRound.getWidth(), toRound.getHeight(), getSafeConfig(toRound));
-    if (toReuse != null) {
-      result = toReuse;
-    } else {
+    Bitmap result = pool.get(toRound.getWidth(), toRound.getHeight(), getSafeConfig(toRound));
+
+    if (result == null) {
      result = Bitmap.createBitmap(toRound.getWidth(), toRound.getHeight(), getSafeConfig(toRound));
    }

-    final Canvas canvas      = new Canvas(result);
-    final Paint  cornerPaint = new Paint();
-    final Paint  shaderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    Canvas canvas = new Canvas(result);

-    shaderPaint.setShader(new BitmapShader(toRound, TileMode.CLAMP, TileMode.CLAMP));
-    cornerPaint.setColor(colorHint);
    if (Config.RGB_565.equals(result.getConfig())) {
+      Paint  cornerPaint = new Paint();
+      cornerPaint.setColor(colorHint);
+
      canvas.drawRect(0, 0, radius, radius, cornerPaint);
      canvas.drawRect(0, toRound.getHeight() - radius, radius, toRound.getHeight(), cornerPaint);
      canvas.drawRect(toRound.getWidth() - radius, 0, toRound.getWidth(), radius, cornerPaint);
      canvas.drawRect(toRound.getWidth() - radius, toRound.getHeight() - radius, toRound.getWidth(), toRound.getHeight(), cornerPaint);
    }
+
+    Paint shaderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    shaderPaint.setShader(new BitmapShader(toRound, TileMode.CLAMP, TileMode.CLAMP));
+
    canvas.drawRoundRect(new RectF(0, 0, toRound.getWidth(), toRound.getHeight()), radius, radius, shaderPaint);
-//    Log.w("RoundedCorners", "in was " + toRound.getWidth() + "x" + toRound.getHeight() + ", out to " + result.getWidth() + "x" + result.getHeight());
+
    return result;
  }

@@ -92,7 +98,8 @@ public class RoundedCorners extends BitmapTransformation {
    return bitmap.getConfig() != null ? bitmap.getConfig() : Bitmap.Config.ARGB_8888;
  }

-  @Override public String getId() {
+  @Override
+  public String getId() {
    return RoundedCorners.class.getCanonicalName();
  }
 }
--- a/test/unitTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
+++ b/test/unitTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
@@ -1,156 +0,0 @@
-package org.thoughtcrime.securesms.jobs;
-
-import org.junit.Test;
-import org.thoughtcrime.securesms.BaseUnitTest;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.dependencies.AxolotlStorageModule;
-import org.whispersystems.libsignal.ecc.Curve;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyStore;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
-import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import dagger.Module;
-import dagger.ObjectGraph;
-import dagger.Provides;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-public class CleanPreKeysJobTest extends BaseUnitTest {
-  @Test
-  public void testSignedPreKeyRotationNotRegistered() throws IOException, MasterSecretJob.RequirementNotMetException {
-    SignalServiceAccountManager accountManager    = mock(SignalServiceAccountManager.class);
-    SignedPreKeyStore           signedPreKeyStore = mock(SignedPreKeyStore.class);
-    MasterSecret                masterSecret      = mock(MasterSecret.class);
-    when(accountManager.getSignedPreKey()).thenReturn(null);
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(context);
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    cleanPreKeysJob.onRun(masterSecret);
-
-    verify(accountManager).getSignedPreKey();
-    verifyNoMoreInteractions(signedPreKeyStore);
-  }
-
-  @Test
-  public void testSignedPreKeyEviction() throws Exception {
-    SignedPreKeyStore           signedPreKeyStore         = mock(SignedPreKeyStore.class);
-    SignalServiceAccountManager accountManager            = mock(SignalServiceAccountManager.class);
-    SignedPreKeyEntity          currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
-    MasterSecret                masterSecret              = mock(MasterSecret.class);
-
-    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
-    when(accountManager.getSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
-
-    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(), new byte[64]);
-
-    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
-      add(new SignedPreKeyRecord(2, 11, Curve.generateKeyPair(), new byte[32]));
-      add(new SignedPreKeyRecord(4, System.currentTimeMillis() - 100, Curve.generateKeyPair(), new byte[64]));
-      add(currentRecord);
-      add(new SignedPreKeyRecord(3, System.currentTimeMillis() - 90, Curve.generateKeyPair(), new byte[64]));
-      add(new SignedPreKeyRecord(1, 10, Curve.generateKeyPair(), new byte[32]));
-    }};
-
-    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
-    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(context);
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    cleanPreKeysJob.onRun(masterSecret);
-
-    verify(signedPreKeyStore).removeSignedPreKey(eq(1));
-    verify(signedPreKeyStore, times(1)).removeSignedPreKey(anyInt());
-  }
-
-  @Test
-  public void testSignedPreKeyNoEviction() throws Exception {
-    SignedPreKeyStore           signedPreKeyStore         = mock(SignedPreKeyStore.class);
-    SignalServiceAccountManager accountManager            = mock(SignalServiceAccountManager.class);
-    SignedPreKeyEntity          currentSignedPreKeyEntity = mock(SignedPreKeyEntity.class);
-
-    when(currentSignedPreKeyEntity.getKeyId()).thenReturn(3133);
-    when(accountManager.getSignedPreKey()).thenReturn(currentSignedPreKeyEntity);
-
-    final SignedPreKeyRecord currentRecord = new SignedPreKeyRecord(3133, System.currentTimeMillis(), Curve.generateKeyPair(), new byte[64]);
-
-    List<SignedPreKeyRecord> records = new LinkedList<SignedPreKeyRecord>() {{
-      add(currentRecord);
-    }};
-
-    when(signedPreKeyStore.loadSignedPreKeys()).thenReturn(records);
-    when(signedPreKeyStore.loadSignedPreKey(eq(3133))).thenReturn(currentRecord);
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(context);
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    verify(signedPreKeyStore, never()).removeSignedPreKey(anyInt());
-  }
-
-  @Test
-  public void testConnectionError() throws Exception {
-    SignedPreKeyStore        signedPreKeyStore = mock(SignedPreKeyStore.class);
-    SignalServiceAccountManager accountManager    = mock(SignalServiceAccountManager.class);
-    MasterSecret             masterSecret      = mock(MasterSecret.class);
-
-    when(accountManager.getSignedPreKey()).thenThrow(new PushNetworkException("Connectivity error!"));
-
-    CleanPreKeysJob cleanPreKeysJob = new CleanPreKeysJob(context);
-
-    ObjectGraph objectGraph = ObjectGraph.create(new TestModule(accountManager, signedPreKeyStore));
-    objectGraph.inject(cleanPreKeysJob);
-
-    try {
-      cleanPreKeysJob.onRun(masterSecret);
-      throw new AssertionError("should have failed!");
-    } catch (IOException e) {
-      assertTrue(cleanPreKeysJob.onShouldRetry(e));
-    }
-  }
-
-  @Module(injects = {CleanPreKeysJob.class})
-  public static class TestModule {
-    private final SignalServiceAccountManager accountManager;
-    private final SignedPreKeyStore        signedPreKeyStore;
-
-    private TestModule(SignalServiceAccountManager accountManager, SignedPreKeyStore signedPreKeyStore) {
-      this.accountManager    = accountManager;
-      this.signedPreKeyStore = signedPreKeyStore;
-    }
-
-    @Provides SignalServiceAccountManager provideTextSecureAccountManager() {
-      return accountManager;
-    }
-
-    @Provides
-    AxolotlStorageModule.SignedPreKeyStoreFactory provideSignedPreKeyStore() {
-      return new AxolotlStorageModule.SignedPreKeyStoreFactory() {
-        @Override
-        public SignedPreKeyStore create() {
-          return signedPreKeyStore;
-        }
-      };
-    }
-  }
-}
Author	SHA1	Message	Date
Moxie Marlinspike	ac2626437e	Bump version to 3.26.2 // FREEBIE	2017-01-09 08:00:53 -08:00
Moxie Marlinspike	99b8cfc82b	Include missing cardview dependency Fixes #6026 // FREEBIE	2017-01-09 07:51:56 -08:00
Moxie Marlinspike	6eef1a6ee4	Bump version to 3.26.1 // FREEBIE	2017-01-08 13:11:48 -08:00
Moxie Marlinspike	4ad989cc38	Fix rounded corners bitmap double free Fixes #4732 // FREEBIE	2017-01-08 13:06:11 -08:00
Moxie Marlinspike	5804213152	Eliminate item animations in ConversationFragment Experience feels faster this way too // FREEBIE	2017-01-08 10:16:23 -08:00
Moxie Marlinspike	d599c058c6	No choice but to multiDex // FREEBIE	2017-01-08 09:58:01 -08:00
Moxie Marlinspike	b7d4294314	This is no longer testable =( // FREEBIE	2017-01-07 11:36:50 -08:00
Moxie Marlinspike	d280604f1f	Fix compileSdk 25 problems with GIF search For #5965 // FREEBIE	2017-01-07 11:02:18 -08:00
AsamK	7817e38e5f	Fix crash when clicking on a gif image For gif images, the dimensions is always null. Closes #6021 //FREEBIE	2017-01-07 10:40:22 -08:00
Moxie Marlinspike	f310dd6047	Update Play Services Apparently we've put this off for as long as we can Fixes #6018 // FREEBIE	2017-01-06 18:00:40 -08:00