Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-01-01 04:17:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed hardcoded mime strings, removed file name from media upload

Browse Source 
Signed-off-by: nuclearfog <hatespirit666@gmail.com>
This commit is contained in:
nuclearfog 2021-10-23 12:05:58 +02:00
parent f624d18d6f
commit b28e675083
No known key found for this signature in database
GPG Key ID: AA0271FBE406DB98
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/org/nuclearfog/twidda/activity/MediaActivity.java
View File

@ -62,20 +62,15 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
{WRITE_EXTERNAL_STORAGE}
};
/**
* mime type for image files with undefined extensions
*/
private static final String TYPE_IMAGE = "image/*";
/**
* mime type for image files with undefined extensions
*/
private static final String TYPE_VIDEO = "video/*";
private static final String MIME_ALL_READ = "*/*";
private static final String MIME_IMAGE_READ = "image/*";
private static final String MIME_VIDEO_READ = "video/*";
private static final String MIME_IMAGE_WRITE = "image/jpeg";
/**
* mime types for videos and images
*/
private static final String[] TYPE_ALL = {TYPE_IMAGE, TYPE_VIDEO};
private static final String[] TYPE_ALL = {MIME_IMAGE_READ, MIME_VIDEO_READ};
/**
* Cursor mode to get the full path to the image
@ -176,13 +171,10 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
Cursor cursor = getContentResolver().query(intent.getData(), GET_MEDIA, null, null, null);
if (cursor != null) {
if (cursor.moveToFirst()) {
int index = cursor.getColumnIndexOrThrow(GET_MEDIA[0]);
if (index >= 0) {
String path = cursor.getString(index);
if (path != null) {
onMediaFetched(reqCode, path);
// todo add error handling if no media returned
}
String path = cursor.getString(0);
if (path != null) {
onMediaFetched(reqCode, path);
// todo add error handling if no media returned
}
}
cursor.close();
@ -233,7 +225,7 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
values.put(DISPLAY_NAME, filename);
values.put(DATE_TAKEN, System.currentTimeMillis());
values.put(RELATIVE_PATH, DIRECTORY_PICTURES);
values.put(MIME_TYPE, "image/jpeg");
values.put(MIME_TYPE, MIME_IMAGE_WRITE);
Uri imageUri = getContentResolver().insert(EXTERNAL_CONTENT_URI, values);
if (imageUri != null) {
OutputStream fileStream = getContentResolver().openOutputStream(imageUri);
@ -346,18 +338,18 @@ public abstract class MediaActivity extends AppCompatActivity implements Locatio
switch (requestCode) {
case REQUEST_IMG_VID:
// pick image or video
mediaSelect.setType("*/*");
mediaSelect.setType(MIME_ALL_READ);
mediaSelect.putExtra(EXTRA_MIME_TYPES, TYPE_ALL);
break;
case REQUEST_IMAGE:
case REQUEST_PROFILE:
case REQUEST_BANNER:
mediaSelect.setType(TYPE_IMAGE);
mediaSelect.setType(MIME_IMAGE_READ);
break;
}
} else {
mediaSelect.setType("*/*");
mediaSelect.setType(MIME_ALL_READ);
}
try {
startActivityForResult(mediaSelect, requestCode);

6
app/src/main/java/org/nuclearfog/twidda/backend/engine/TwitterEngine.java
View File

@ -1165,8 +1165,7 @@ public class TwitterEngine {
*/
public long uploadImage(@NonNull String path) throws EngineException {
try {
File file = new File(path);
UploadedMedia media = twitter.uploadMedia(file.getName(), new FileInputStream(file));
UploadedMedia media = twitter.uploadMedia("", new FileInputStream(path));
return media.getMediaId();
} catch (FileNotFoundException err) {
throw new EngineException(EngineException.InternalErrorType.FILENOTFOUND);
@ -1184,8 +1183,7 @@ public class TwitterEngine {
*/
public long uploadVideo(@NonNull String path) throws EngineException {
try {
File file = new File(path);
UploadedMedia media = twitter.uploadMediaChunked(file.getName(), new FileInputStream(file));
UploadedMedia media = twitter.uploadMediaChunked("", new FileInputStream(path));
return media.getMediaId();
} catch (FileNotFoundException err) {
throw new EngineException(EngineException.InternalErrorType.FILENOTFOUND);