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

fixed crash

This commit is contained in:
nuclearfog 2022-11-06 23:21:00 +01:00
parent 4b5571ec85
commit 951a747395
No known key found for this signature in database
GPG Key ID: 03488A185C476379
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,23 +306,22 @@ public class TweetV1 implements Status {
if (media.length() > 0) { if (media.length() > 0) {
// determine MIME type // determine MIME type
JSONObject mediaItem = media.getJSONObject(0); JSONObject mediaItem = media.getJSONObject(0);
String[] links = new String[media.length()];
String mime = mediaItem.getString("type"); String mime = mediaItem.getString("type");
switch (mime) { switch (mime) {
case "photo": case "photo":
mediaType = MEDIA_PHOTO; mediaType = MEDIA_PHOTO;
// get media URLs // get media URLs
for (int pos = 0; pos < links.length; pos++) { String[] links = new String[media.length()];
for (int pos = 0; pos < media.length(); pos++) {
JSONObject item = media.getJSONObject(pos); JSONObject item = media.getJSONObject(pos);
if (item != null) { links[pos] = item.getString("media_url_https");
links[pos] = item.getString("media_url_https");
}
} }
return links; return links;
case "video": case "video":
mediaType = MEDIA_VIDEO; mediaType = MEDIA_VIDEO;
int maxBitrate = -1; int maxBitrate = -1;
links = new String[1];
JSONObject video = mediaItem.getJSONObject("video_info"); JSONObject video = mediaItem.getJSONObject("video_info");
JSONArray videoVariants = video.getJSONArray("variants"); JSONArray videoVariants = video.getJSONArray("variants");
for (int pos = 0; pos < videoVariants.length(); pos++) { for (int pos = 0; pos < videoVariants.length(); pos++) {
@ -337,6 +336,7 @@ public class TweetV1 implements Status {
case "animated_gif": case "animated_gif":
mediaType = MEDIA_GIF; mediaType = MEDIA_GIF;
links = new String[1];
JSONObject gif = mediaItem.getJSONObject("video_info"); JSONObject gif = mediaItem.getJSONObject("video_info");
JSONObject gifVariant = gif.getJSONArray("variants").getJSONObject(0); JSONObject gifVariant = gif.getJSONArray("variants").getJSONObject(0);
if (MIME_V_MP4.equals(gifVariant.getString("content_type"))) { if (MIME_V_MP4.equals(gifVariant.getString("content_type"))) {

2
app/src/main/java/org/nuclearfog/twidda/ui/fragments/AccountFragment.java
View File

@ -89,7 +89,7 @@ public class AccountFragment extends ListFragment implements OnAccountClickListe
// set new account // set new account
settings.setUserId(account.getId()); settings.setUserId(account.getId());
// setup Twitter account // setup Twitter account
if (account.getHostname().equals(Twitter.API)) { if (Twitter.API.equals(account.getHostname())) {
settings.setAccessToken(account.getAccessToken()); settings.setAccessToken(account.getAccessToken());
settings.setTokenSecret(account.getTokenSecret()); settings.setTokenSecret(account.getTokenSecret());
if (!account.getApiKey().isEmpty() && !account.getApiSecret().isEmpty()) { if (!account.getApiKey().isEmpty() && !account.getApiSecret().isEmpty()) {