TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better null result handling

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2016-11-01 09:01:10 -07:00
parent 469f41b955
commit 4bf3632b40
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
View File

@ -42,7 +42,7 @@ public abstract class GiphyLoader extends AsyncLoader<List<GiphyImage>> {
return loadPage(0);
}
public List<GiphyImage> loadPage(int offset) {
public @NonNull List<GiphyImage> loadPage(int offset) {
try {
String url;
@ -57,8 +57,11 @@ public abstract class GiphyLoader extends AsyncLoader<List<GiphyImage>> {
}
GiphyResponse giphyResponse = JsonUtils.fromJson(response.body().byteStream(), GiphyResponse.class);
List<GiphyImage> results = giphyResponse.getData();
if (results == null) return new LinkedList<>();
else return results;
return giphyResponse.getData();
} catch (IOException e) {
Log.w(TAG, e);
return new LinkedList<>();

3
src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
View File

@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.giph.ui;
import android.content.Context;
import android.graphics.drawable.ColorDrawable;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
@ -106,7 +107,7 @@ public class GiphyAdapter extends RecyclerView.Adapter<GiphyAdapter.GiphyViewHol
this.images = images;
}
public void setImages(List<GiphyImage> images) {
public void setImages(@NonNull List<GiphyImage> images) {
this.images = images;
notifyDataSetChanged();
}

5
src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
View File

@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.giph.ui;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
@ -63,10 +64,10 @@ public abstract class GiphyFragment extends Fragment implements LoaderManager.Lo
}
@Override
public void onLoadFinished(Loader<List<GiphyImage>> loader, List<GiphyImage> data) {
public void onLoadFinished(Loader<List<GiphyImage>> loader, @NonNull List<GiphyImage> data) {
this.loadingProgress.setVisibility(View.GONE);
if (data == null || data.isEmpty()) noResultsView.setVisibility(View.VISIBLE);
if (data.isEmpty()) noResultsView.setVisibility(View.VISIBLE);
else noResultsView.setVisibility(View.GONE);
this.giphyAdapter.setImages(data);