diff options
| author | stom79 <tschneider.ac@gmail.com> | 2018-12-15 18:47:28 +0100 |
|---|---|---|
| committer | stom79 <tschneider.ac@gmail.com> | 2018-12-15 18:47:28 +0100 |
| commit | 9944c1908ef861165cc82da01a12bca1ee2bb28f (patch) | |
| tree | 884b7869b7ec7b5b03d06a3996182e8d5758abec | |
| parent | bce50ed4eab178c97d5c34012ea43b7801269b02 (diff) | |
Prepares release 1.41.0
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java | 9 | ||||
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/app/build.gradle b/app/build.gradle index 4d9b44231..3d52c7bff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 16 targetSdkVersion 28 - versionCode 202 - versionName "1.40.0" + versionCode 203 + versionName "1.41.0" multiDexEnabled true } dexOptions { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 1074c0ad1..ef84b573d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -474,10 +474,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct Glide.with(context) .load(status.getMedia_attachments().get(0).getPreview_url()) .into(holder.art_media); - Glide.with(context) - .load(status.getAccount().getAvatar()) - .apply(new RequestOptions().transforms(new FitCenter(), new RoundedCorners(10))) - .into(holder.art_pp); + if( status.getAccount() != null && status.getAccount().getAvatar() != null) + Glide.with(context) + .load(status.getAccount().getAvatar()) + .apply(new RequestOptions().transforms(new FitCenter(), new RoundedCorners(10))) + .into(holder.art_pp); holder.art_pp.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { 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 7e3d45cf3..9ac9101d5 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 @@ -2412,7 +2412,9 @@ public class Helper { public static void installProvider(){ - Security.insertProviderAt(Conscrypt.newProvider(),1); + try { + Security.insertProviderAt(Conscrypt.newProvider(),1); + }catch (Exception ignored){} } |