Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix, tweet video improvement

This commit is contained in:
nuclearfog 2022-10-26 21:18:18 +02:00
parent 270a02c6ab
commit d6b48a4465
No known key found for this signature in database
GPG Key ID: 03488A185C476379
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/nuclearfog/twidda/backend/api/impl/TweetV1.java
View File

@ -318,13 +318,15 @@ public class TweetV1 implements Tweet {
case "video":
mediaType = MEDIA_VIDEO;
int maxBitrate = -1;
JSONObject video = mediaItem.getJSONObject("video_info");
JSONArray videoVariants = video.getJSONArray("variants");
for (int pos = 0; pos < videoVariants.length(); pos++) {
JSONObject variant = videoVariants.getJSONObject(pos);
if (MIME_V_MP4.equals(variant.getString("content_type"))) {
int bitRate = variant.optInt("bitrate", 0);
if (bitRate > maxBitrate && MIME_V_MP4.equals(variant.getString("content_type"))) {
links[0] = variant.getString("url");
break;
maxBitrate = bitRate;
}
}
return links;

7
app/src/main/java/org/nuclearfog/twidda/ui/activities/VideoViewer.java
View File

@ -347,7 +347,12 @@ public class VideoViewer extends MediaActivity implements OnSeekBarChangeListene
@Override
public boolean onError(MediaPlayer mp, int what, int extra) {
if (what == MEDIA_ERROR_UNKNOWN) {
confirmDialog.show(ConfirmDialog.VIDEO_ERROR);
if (link.getScheme().startsWith("http")) {
confirmDialog.show(ConfirmDialog.VIDEO_ERROR);
} else {
Toast.makeText(this, R.string.error_cant_load_video, LENGTH_SHORT).show();
finish();
}
return true;
}
return false;