Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 11:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add better handling for non-existent response bodies or empty responses from giphy.

Browse Source
This commit is contained in:
Alex Hart
2021-04-22 14:33:56 -03:00
parent 763aeabddd
commit a4868602b5
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/giph/mp4/GiphyMp4PagedDataSource.java
View File

@@ -13,8 +13,10 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.giph.model.GiphyImage;
import org.thoughtcrime.securesms.giph.model.GiphyResponse;
import org.thoughtcrime.securesms.util.JsonUtils;
import org.whispersystems.util.Base64;
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
@@ -43,7 +45,8 @@ final class GiphyMp4PagedDataSource implements PagedDataSource<GiphyImage> {
GiphyResponse response = performFetch(0, 1);
return response.getPagination().getTotalCount();
} catch (IOException e) {
} catch (IOException | NullPointerException e) {
Log.w(TAG, "Failed to get size", e);
return 0;
}
}
@@ -53,8 +56,8 @@ final class GiphyMp4PagedDataSource implements PagedDataSource<GiphyImage> {
try {
Log.d(TAG, "Loading from " + start + " to " + (start + length));
return new LinkedList<>(performFetch(start, length).getData());
} catch (IOException e) {
Log.w(TAG, e);
} catch (IOException | NullPointerException e) {
Log.w(TAG, "Failed to load content", e);
return new LinkedList<>();
}
}
@@ -73,6 +76,10 @@ final class GiphyMp4PagedDataSource implements PagedDataSource<GiphyImage> {
throw new IOException("Unexpected code " + response);
}
if (response.body() == null) {
throw new IOException("Response body was not present");
}
return JsonUtils.fromJson(response.body().byteStream(), GiphyResponse.class);
}
}