fix some lint warnings

This commit is contained in:
Conny Duck 2017-12-01 22:31:34 +01:00
parent c20ee1d593
commit 7abd8c8d70
4 changed files with 8 additions and 40 deletions

View file

@ -19,8 +19,6 @@ import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert; import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import android.arch.persistence.room.Query;
import android.arch.persistence.room.Transaction;
import android.arch.persistence.room.Update;
import java.util.List; import java.util.List;

View file

@ -16,7 +16,6 @@
package com.keylesspalace.tusky.fragment; package com.keylesspalace.tusky.fragment;
import android.app.Activity; import android.app.Activity;
import android.app.NotificationManager;
import android.arch.core.util.Function; import android.arch.core.util.Function;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -38,7 +37,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.keylesspalace.tusky.MainActivity; import com.keylesspalace.tusky.MainActivity;
import com.keylesspalace.tusky.NotificationPullJobCreator;
import com.keylesspalace.tusky.adapter.FooterViewHolder; import com.keylesspalace.tusky.adapter.FooterViewHolder;
import com.keylesspalace.tusky.adapter.NotificationsAdapter; import com.keylesspalace.tusky.adapter.NotificationsAdapter;
import com.keylesspalace.tusky.R; import com.keylesspalace.tusky.R;
@ -493,12 +491,7 @@ public class NotificationsFragment extends SFragment implements
/* When this is called by the EndlessScrollListener it cannot refresh the footer state /* When this is called by the EndlessScrollListener it cannot refresh the footer state
* using adapter.notifyItemChanged. So its necessary to postpone doing so until a * using adapter.notifyItemChanged. So its necessary to postpone doing so until a
* convenient time for the UI thread using a Runnable. */ * convenient time for the UI thread using a Runnable. */
recyclerView.post(new Runnable() { recyclerView.post(() -> adapter.setFooterState(FooterViewHolder.State.LOADING));
@Override
public void run() {
adapter.setFooterState(FooterViewHolder.State.LOADING);
}
});
} }
Call<List<Notification>> call = mastodonApi.notifications(fromId, uptoId, LOAD_AT_ONCE); Call<List<Notification>> call = mastodonApi.notifications(fromId, uptoId, LOAD_AT_ONCE);
@ -613,7 +606,7 @@ public class NotificationsFragment extends SFragment implements
int newIndex = liftedNew.indexOf(notifications.get(0)); int newIndex = liftedNew.indexOf(notifications.get(0));
if (newIndex == -1) { if (newIndex == -1) {
if (index == -1 && liftedNew.size() >= LOAD_AT_ONCE) { if (index == -1 && liftedNew.size() >= LOAD_AT_ONCE) {
liftedNew.add(Either.<Placeholder, Notification>left(Placeholder.getInstance())); liftedNew.add(Either.left(Placeholder.getInstance()));
} }
notifications.addAll(0, liftedNew); notifications.addAll(0, liftedNew);
} else { } else {
@ -678,7 +671,7 @@ public class NotificationsFragment extends SFragment implements
// If we fetched at least as much it means that there are more posts to load and we should // If we fetched at least as much it means that there are more posts to load and we should
// insert new placeholder // insert new placeholder
if (newNotifications.size() >= LOAD_AT_ONCE) { if (newNotifications.size() >= LOAD_AT_ONCE) {
liftedNew.add(Either.<Placeholder, Notification>left(Placeholder.getInstance())); liftedNew.add(Either.left(Placeholder.getInstance()));
} }
notifications.addAll(pos, liftedNew); notifications.addAll(pos, liftedNew);
@ -686,12 +679,7 @@ public class NotificationsFragment extends SFragment implements
} }
private final Function<Notification, Either<Placeholder, Notification>> notificationLifter = private final Function<Notification, Either<Placeholder, Notification>> notificationLifter =
new Function<Notification, Either<Placeholder, Notification>>() { Either::right;
@Override
public Either<Placeholder, Notification> apply(Notification input) {
return Either.right(input);
}
};
private List<Either<Placeholder, Notification>> liftNotificationList(List<Notification> list) { private List<Either<Placeholder, Notification>> liftNotificationList(List<Notification> list) {
return CollectionUtil.map(list, notificationLifter); return CollectionUtil.map(list, notificationLifter);

View file

@ -552,12 +552,7 @@ public class TimelineFragment extends SFragment implements
/* When this is called by the EndlessScrollListener it cannot refresh the footer state /* When this is called by the EndlessScrollListener it cannot refresh the footer state
* using adapter.notifyItemChanged. So its necessary to postpone doing so until a * using adapter.notifyItemChanged. So its necessary to postpone doing so until a
* convenient time for the UI thread using a Runnable. */ * convenient time for the UI thread using a Runnable. */
recyclerView.post(new Runnable() { recyclerView.post(() -> adapter.setFooterState(FooterViewHolder.State.LOADING));
@Override
public void run() {
adapter.setFooterState(FooterViewHolder.State.LOADING);
}
});
} }
Callback<List<Status>> callback = new Callback<List<Status>>() { Callback<List<Status>> callback = new Callback<List<Status>>() {
@ -705,7 +700,7 @@ public class TimelineFragment extends SFragment implements
int newIndex = liftedNew.indexOf(statuses.get(0)); int newIndex = liftedNew.indexOf(statuses.get(0));
if (newIndex == -1) { if (newIndex == -1) {
if (index == -1 && fullFetch) { if (index == -1 && fullFetch) {
liftedNew.add(Either.<Placeholder, Status>left(Placeholder.getInstance())); liftedNew.add(Either.left(Placeholder.getInstance()));
} }
statuses.addAll(0, liftedNew); statuses.addAll(0, liftedNew);
} else { } else {
@ -755,7 +750,7 @@ public class TimelineFragment extends SFragment implements
List<Either<Placeholder, Status>> liftedNew = listStatusList(newStatuses); List<Either<Placeholder, Status>> liftedNew = listStatusList(newStatuses);
if (fullFetch) { if (fullFetch) {
liftedNew.add(Either.<Placeholder, Status>left(Placeholder.getInstance())); liftedNew.add(Either.left(Placeholder.getInstance()));
} }
statuses.addAll(pos, liftedNew); statuses.addAll(pos, liftedNew);
@ -773,12 +768,7 @@ public class TimelineFragment extends SFragment implements
} }
private final Function<Status, Either<Placeholder, Status>> statusLifter = private final Function<Status, Either<Placeholder, Status>> statusLifter =
new Function<Status, Either<Placeholder, Status>>() { Either::right;
@Override
public Either<Placeholder, Status> apply(Status input) {
return Either.right(input);
}
};
private @Nullable private @Nullable
Pair<StatusViewData.Concrete, Integer> Pair<StatusViewData.Concrete, Integer>

View file

@ -20,23 +20,15 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.drawable.Drawable;
import android.media.MediaMetadataRetriever; import android.media.MediaMetadataRetriever;
import android.media.ThumbnailUtils; import android.media.ThumbnailUtils;
import android.net.Uri; import android.net.Uri;
import android.os.Environment;
import android.provider.OpenableColumns; import android.provider.OpenableColumns;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.Px; import android.support.annotation.Px;
import android.support.v4.content.FileProvider;
import com.squareup.picasso.Picasso;
import com.squareup.picasso.Target;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;