Compare commits

...

6 Commits

Author SHA1 Message Date
Moxie Marlinspike
5def8ba78d Bump version to 2.4.2
// FREEBIE
2015-01-14 13:51:53 -08:00
Jake McGinty
42da687602 Revert "add theme to import/export activity"
This reverts commit e64c067636.
2015-01-14 10:23:10 -10:00
Calvin Hu
e64c067636 add theme to import/export activity 2015-01-14 10:03:02 -10:00
Calvin Hu
c89fbabbf3 refresh contacts database on new db query 2015-01-13 15:16:30 -10:00
Moxie Marlinspike
778b8b490c Merge pull request #2346 from mcginty/thumbnail-early-recycle
fix early recycling of thumbnail
2015-01-13 16:21:15 -08:00
Jake McGinty
bade52d748 fix early recycling of thumbnail
// FREEBIE
2015-01-13 14:17:03 -10:00
3 changed files with 4 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="89"
android:versionName="2.4.1">
android:versionCode="90"
android:versionName="2.4.2">
<permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
android:label="Access to TextSecure Secrets"

View File

@@ -41,6 +41,7 @@ public class ContactsCursorLoader extends CursorLoader {
@Override
public Cursor loadInBackground() {
ContactsDatabase.destroyInstance();
db = ContactsDatabase.getInstance(context);
return db.query(filter, pushOnly);
}

View File

@@ -92,9 +92,7 @@ public class MediaUtil {
}
public InputStream toDataStream() {
InputStream jpegStream = BitmapUtil.toCompressedJpeg(bitmap);
bitmap.recycle();
return jpegStream;
return BitmapUtil.toCompressedJpeg(bitmap);
}
}
}