Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Some changes

This commit is contained in:
Thomas 2020-06-19 18:00:48 +02:00
parent 7bd1a874ff
commit 0e7f95f626
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/client/APIResponse.java
View File

@ -78,7 +78,6 @@ public class APIResponse {
private Context context = null;
private List<PixelFedStory> pixelFedStories = null;
private List<PixelFedStoryItem> pixelFedStoryItems = null;
private PixelFedStory pixelFedStory = null;
private List<Trends> trends = null;
private List<IdentityProof> identityProofs = null;

12
app/src/main/java/app/fedilab/android/client/GNUAPI.java
View File

@ -1476,24 +1476,20 @@ public class GNUAPI {
case FAVOURITE:
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
action = "/favorites/create.json";
params = new HashMap<>();
params.put("id", targetedId);
} else {
action = "/friendica/activity/like.json";
params = new HashMap<>();
params.put("id", targetedId);
}
params = new HashMap<>();
params.put("id", targetedId);
break;
case UNFAVOURITE:
if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
action = "/favorites/destroy.json";
params = new HashMap<>();
params.put("id", targetedId);
} else {
action = "/friendica/activity/unlike.json";
params = new HashMap<>();
params.put("id", targetedId);
}
params = new HashMap<>();
params.put("id", targetedId);
break;
case REBLOG:
action = String.format("/statuses/retweet/%s.json", targetedId);

4
app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
View File

@ -88,7 +88,9 @@ public class CustomEmojiAdapter extends BaseAdapter {
@Override
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
emoji.setDrawable(resource);
imageView.setImageDrawable(emoji.getDrawable());
if( imageView != null && emoji.getDrawable() != null) {
imageView.setImageDrawable(emoji.getDrawable());
}
}
@Override

2
app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
View File

@ -262,7 +262,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter<RecyclerView.
else
typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_mention));
imgH = ContextCompat.getDrawable(context, R.drawable.ic_chat_bubble_outline);
if (notification.getStatus().getVisibility().equals("direct")) {
if (notification.getStatus() != null && notification.getStatus().getVisibility().equals("direct")) {
holder.main_container_trans.setVisibility(View.GONE);
} else {
holder.main_container_trans.setVisibility(View.VISIBLE);

1
app/src/main/java/app/fedilab/android/jobs/ScheduledBoostsSyncJob.java
View File

@ -65,6 +65,7 @@ public class ScheduledBoostsSyncJob extends Job {
return jobId;
}
@SuppressWarnings("UnusedReturnValue")
public static int scheduleUpdate(Context context, int tootStoredId, long timestampScheduling) {
long startMs = (timestampScheduling - new Date().getTime());