From ac77f1393ae8874b11bde99ed1e46d0362e0aa50 Mon Sep 17 00:00:00 2001 From: tom79 Date: Tue, 19 Sep 2017 18:19:46 +0200 Subject: [PATCH 1/3] Fixes crashes --- .../gouv/etalab/mastodon/fragments/DisplayStatusFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index 404b891ea..acde86826 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -295,7 +295,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn } if( statuses != null && statuses.size() > 0) { for(Status tmpStatus: statuses){ - if( type == RetrieveFeedsAsyncTask.Type.HOME && firstLoad && Long.parseLong(tmpStatus.getId()) > Long.parseLong(lastReadStatus)){ + if( type == RetrieveFeedsAsyncTask.Type.HOME && firstLoad && lastReadStatus != null && Long.parseLong(tmpStatus.getId()) > Long.parseLong(lastReadStatus)){ tmpStatus.setNew(true); MainActivity.countNewStatus++; }else { From 41868ccab1191ed535a8a71dd906c3013181710e Mon Sep 17 00:00:00 2001 From: tom79 Date: Tue, 19 Sep 2017 18:20:40 +0200 Subject: [PATCH 2/3] Fixes crashes notifications --- .../etalab/mastodon/fragments/DisplayNotificationsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java index 35f984b86..c24e66787 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java @@ -205,7 +205,7 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve } if( notifications != null && notifications.size() > 0) { for(Notification tmpNotification: notifications){ - if( Long.parseLong(tmpNotification.getId()) > Long.parseLong(lastReadNotifications)) + if( lastReadNotifications != null && Long.parseLong(tmpNotification.getId()) > Long.parseLong(lastReadNotifications)) MainActivity.countNewNotifications++; this.notifications.add(tmpNotification); } From 1a6baad6ed708f897d44ea249d9346e6cb91773a Mon Sep 17 00:00:00 2001 From: tom79 Date: Tue, 19 Sep 2017 18:37:26 +0200 Subject: [PATCH 3/3] Prepares release 1.4.9-beta-3 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7cc28cdd2..f38081389 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 25 - versionCode 50 - versionName "1.4.9-beta-2" + versionCode 51 + versionName "1.4.9-beta-3" } buildTypes { release {