Compare commits

...

2 Commits

Author SHA1 Message Date
Moxie Marlinspike
c989be9c05 Bump version to 2.14.5
// FREEBIE
2015-05-15 08:26:45 -07:00
Moxie Marlinspike
66e0e18e44 Fix for deadlock if MessageNotifier called from UI thread.
Fixes #3173

// FREEBIE
2015-05-15 08:26:04 -07:00
2 changed files with 7 additions and 5 deletions

View File

@@ -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="118"
android:versionName="2.14.4">
android:versionCode="119"
android:versionName="2.14.5">
<uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable"/>

View File

@@ -21,7 +21,6 @@ import android.util.Log;
import android.util.Pair;
import com.android.gallery3d.data.Exif;
import com.makeramen.RoundedDrawable;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.mms.PartAuthority;
@@ -263,7 +262,7 @@ public class BitmapUtil {
final AtomicBoolean created = new AtomicBoolean(false);
final Bitmap[] result = new Bitmap[1];
new Handler(Looper.getMainLooper()).post(new Runnable() {
Runnable runnable = new Runnable() {
@Override
public void run() {
if (drawable instanceof BitmapDrawable) {
@@ -295,7 +294,10 @@ public class BitmapUtil {
result.notifyAll();
}
}
});
};
if (Looper.myLooper() == Looper.getMainLooper()) runnable.run();
else new Handler(Looper.getMainLooper()).post(runnable);
synchronized (result) {
while (!created.get()) Util.wait(result, 0);