From 78762bef1b67658ecca5b5463298674e58dbd9d1 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Thu, 23 May 2019 18:51:40 +0200
Subject: [PATCH] Fix potential crashes

---
 app/src/main/java/app/fedilab/android/client/API.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java
index 624963838..18d00469c 100644
--- a/app/src/main/java/app/fedilab/android/client/API.java
+++ b/app/src/main/java/app/fedilab/android/client/API.java
@@ -1009,8 +1009,13 @@ public class API {
             return getHomeTimeline(max_id);
         }else{
             if( statuses.size() > 0) {
-                apiResponse.setSince_id(String.valueOf(Long.parseLong(statuses.get(0).getId())+1));
-                apiResponse.setMax_id(String.valueOf(Long.parseLong(statuses.get(statuses.size() - 1).getId())-1));
+                if( statuses.get(0).getId().matches("\\d+")){
+                    apiResponse.setSince_id(String.valueOf(Long.parseLong(statuses.get(0).getId())+1));
+                    apiResponse.setMax_id(String.valueOf(Long.parseLong(statuses.get(statuses.size() - 1).getId())-1));
+                }else{
+                    apiResponse.setSince_id(String.valueOf(Long.parseLong(statuses.get(0).getId())));
+                    apiResponse.setMax_id(String.valueOf(Long.parseLong(statuses.get(statuses.size() - 1).getId())));
+                }
             }
             apiResponse.setStatuses(statuses);
             return apiResponse;