TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-27 22:38:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Signal 4.41.0

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-07 16:48:54 +10:00
parent 781a8500df 56c17e32f1
commit 1822e87f7c
584 changed files with 9504 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/providers/BlobProvider.java
View File

@@ -179,7 +179,7 @@ public class BlobProvider {
File outputFile = new File(getOrCreateCacheDirectory(context, directory), buildFileName(blobSpec.id));
OutputStream outputStream = ModernEncryptingPartOutputStream.createFor(attachmentSecret, outputFile, true).second;
SignalExecutors.IO.execute(() -> {
SignalExecutors.UNBOUNDED.execute(() -> {
try {
Util.copy(blobSpec.getData(), outputStream);
} catch (IOException e) {

14
src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
View File

@@ -24,6 +24,8 @@ import android.content.UriMatcher;
import android.database.Cursor;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.support.annotation.NonNull;
import org.thoughtcrime.securesms.logging.Log;
import java.io.File;
@@ -56,7 +58,7 @@ public class MmsBodyProvider extends ContentProvider {
}
@Override
public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode) throws FileNotFoundException {
Log.i(TAG, "openFile(" + uri + ", " + mode + ")");
switch (uriMatcher.match(uri)) {
@@ -81,7 +83,7 @@ public class MmsBodyProvider extends ContentProvider {
}
@Override
public int delete(Uri uri, String arg1, String[] arg2) {
public int delete(@NonNull Uri uri, String arg1, String[] arg2) {
switch (uriMatcher.match(uri)) {
case SINGLE_ROW:
return getFile(uri).delete() ? 1 : 0;
@@ -90,22 +92,22 @@ public class MmsBodyProvider extends ContentProvider {
}
@Override
public String getType(Uri arg0) {
public String getType(@NonNull Uri arg0) {
return null;
}
@Override
public Uri insert(Uri arg0, ContentValues arg1) {
public Uri insert(@NonNull Uri arg0, ContentValues arg1) {
return null;
}
@Override
public Cursor query(Uri arg0, String[] arg1, String arg2, String[] arg3, String arg4) {
public Cursor query(@NonNull Uri arg0, String[] arg1, String arg2, String[] arg3, String arg4) {
return null;
}
@Override
public int update(Uri arg0, ContentValues arg1, String arg2, String[] arg3) {
public int update(@NonNull Uri arg0, ContentValues arg1, String arg2, String[] arg3) {
return 0;
}
public static Pointer makeTemporaryPointer(Context context) {