From f500cc7ebf3ddc79af14e001f2962935aebb237e Mon Sep 17 00:00:00 2001
From: Jeff Bowen <jblz@users.noreply.github.com>
Date: Wed, 16 Nov 2022 19:00:11 -0500
Subject: [PATCH] IsoInstantTypeAdapter: Enable parsing of 'offset' date times
 in profile response

---
 .../android/api/gson/IsoInstantTypeAdapter.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/gson/IsoInstantTypeAdapter.java b/mastodon/src/main/java/org/joinmastodon/android/api/gson/IsoInstantTypeAdapter.java
index bfd7743a..726cbfb2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/gson/IsoInstantTypeAdapter.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/gson/IsoInstantTypeAdapter.java
@@ -25,10 +25,21 @@ public class IsoInstantTypeAdapter extends TypeAdapter<Instant>{
 			in.nextNull();
 			return null;
 		}
-		try{
-			return DateTimeFormatter.ISO_INSTANT.parse(in.nextString(), Instant::from);
-		}catch(DateTimeParseException x){
+		String nextString;
+		try {
+			nextString = in.nextString();
+		}catch(Exception e){
 			return null;
 		}
+
+		try{
+			return DateTimeFormatter.ISO_INSTANT.parse(nextString, Instant::from);
+		}catch(DateTimeParseException x){}
+
+		try{
+			return DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(nextString, Instant::from);
+		}catch(DateTimeParseException x){}
+
+		return null;
 	}
 }