diff --git a/app/build.gradle b/app/build.gradle index e8a255ffa..94f24bee9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 25 - versionCode 29 - versionName "1.3.2" + versionCode 30 + versionName "1.3.3" } buildTypes { release { diff --git a/app/mastodon-etalab-v1.3.3.apk b/app/mastodon-etalab-v1.3.3.apk new file mode 100644 index 000000000..eb2ecd1d2 Binary files /dev/null and b/app/mastodon-etalab-v1.3.3.apk differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java index 8992f43bc..c7fa85a12 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java @@ -286,7 +286,6 @@ public class ScheduledTootsListAdapter extends BaseAdapter { } } }); - alertDialog.show(); } }); 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 caf1af8b3..b968c618a 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 @@ -197,7 +197,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf statusListAdapter.notifyDataSetChanged(); } }); - if( currentLocale != null && !status.getLanguage().trim().equals(currentLocale) && !status.getLanguage().trim().equals("null")){ + if( currentLocale != null && status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale) && !status.getLanguage().trim().equals("null")){ holder.status_translate.setVisibility(View.VISIBLE); }else { holder.status_translate.setVisibility(View.GONE);