diff options
| author | stom79 <tschneider.ac@gmail.com> | 2019-01-06 10:07:43 +0100 |
|---|---|---|
| committer | stom79 <tschneider.ac@gmail.com> | 2019-01-06 10:07:43 +0100 |
| commit | 949e8cbc5a146dbd60c8cf5b3592cb7544e2d0b2 (patch) | |
| tree | 6a2765140a72d2dd7fd9b756842e58778fa29edc /app/src/main/java/fr/gouv/etalab/mastodon | |
| parent | b195c8ad62f7f5eb72d5750050c9d3b3dcc1071b (diff) | |
| parent | 6d9804b22b02e063b01ba120f5b06e5ea21843b2 (diff) | |
Merge branch 'develop' into Peertube_stream
Diffstat (limited to 'app/src/main/java/fr/gouv/etalab/mastodon')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 7a11abc25..b87aebf73 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -705,7 +705,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt } boolean disableGif = sharedpreferences.getBoolean(Helper.SET_DISABLE_GIF, false); - if( account.getAvatar() == null && MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) { + if( (account.getAvatar() == null || account.getAvatar().equals("null"))&& MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) { Glide.with(getApplicationContext()).load(R.drawable.missing_peertube).apply(RequestOptions.circleCropTransform()).into(account_pp); }else{ if( !disableGif) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java index 324230d10..9e0ecf134 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/PeertubeAPI.java @@ -2669,7 +2669,7 @@ public class PeertubeAPI { if( accountObject.has("avatar") && !accountObject.isNull("avatar")){ account.setAvatar(accountObject.getJSONObject("avatar").get("path").toString()); }else - account.setAvatar(null); + account.setAvatar("null"); account.setHeader("null"); account.setHeader_static("null"); account.setAvatar_static(accountObject.get("avatar").toString()); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 144da47e5..f8bdb1d5c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -2678,7 +2678,7 @@ public class Helper { return; } } - if( url == null || url.contains("missing.png") || url.contains(".svg")) { + if( url == null || url.equals("null") || url.contains("missing.png") || url.contains(".svg")) { if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) { try { Glide.with(imageView.getContext()) |