kopia lustrzana https://github.com/ryukoposting/Signal-Android
rodzic
209d8148ab
commit
31970c4644
|
@ -1059,6 +1059,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setMedia(Uri uri, MediaType mediaType) {
|
private void setMedia(Uri uri, MediaType mediaType) {
|
||||||
|
if (uri == null) return;
|
||||||
attachmentManager.setMedia(masterSecret, uri, mediaType, getCurrentMediaConstraints());
|
attachmentManager.setMedia(masterSecret, uri, mediaType, getCurrentMediaConstraints());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,6 +72,8 @@ public class MediaUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static @Nullable String getMimeType(Context context, Uri uri) {
|
public static @Nullable String getMimeType(Context context, Uri uri) {
|
||||||
|
if (uri == null) return null;
|
||||||
|
|
||||||
if (PersistentBlobProvider.isAuthority(context, uri)) {
|
if (PersistentBlobProvider.isAuthority(context, uri)) {
|
||||||
return PersistentBlobProvider.getMimeType(context, uri);
|
return PersistentBlobProvider.getMimeType(context, uri);
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue