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

Change count process for replies and improve relationship entity

This commit is contained in:
stom79 2018-09-04 18:25:45 +02:00
parent a38f11580e
commit 4ec8376dd4
4 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/fr/gouv/etalab/mastodon/client/API.java
View File

@ -1933,7 +1933,7 @@ public class API {
try{
status.setReplies_count(Integer.valueOf(resobj.get("replies_count").toString()));
}catch (Exception e){
status.setReplies_count(0);
status.setReplies_count(-1);
}
try {
status.setReblogged(Boolean.valueOf(resobj.get("reblogged").toString()));
@ -2163,6 +2163,16 @@ public class API {
}catch (Exception ignored){
relationship.setMuting_notifications(true);
}
try {
relationship.setEndorsed(Boolean.valueOf(resobj.get("endorsed").toString()));
}catch (Exception ignored){
relationship.setMuting_notifications(false);
}
try {
relationship.setShowing_reblogs(Boolean.valueOf(resobj.get("showing_reblogs").toString()));
}catch (Exception ignored){
relationship.setMuting_notifications(false);
}
relationship.setRequested(Boolean.valueOf(resobj.get("requested").toString()));
} catch (JSONException e) {
setDefaultError(e);

19
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Relationship.java
View File

@ -28,6 +28,9 @@ public class Relationship {
private boolean muting;
private boolean requested;
private boolean muting_notifications;
private boolean endorsed;
private boolean showing_reblogs;
public String getId() {
return id;
@ -84,4 +87,20 @@ public class Relationship {
public void setMuting_notifications(boolean muting_notifications) {
this.muting_notifications = muting_notifications;
}
public boolean isEndorsed() {
return endorsed;
}
public void setEndorsed(boolean endorsed) {
this.endorsed = endorsed;
}
public boolean isShowing_reblogs() {
return showing_reblogs;
}
public void setShowing_reblogs(boolean showing_reblogs) {
this.showing_reblogs = showing_reblogs;
}
}

4
app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java
View File

@ -646,9 +646,7 @@ public class HttpsConnection {
if (httpURLConnection != null)
try {
httpURLConnection.getInputStream().close();
} catch (IOException e) {
e.printStackTrace();
}
} catch (Exception ignored) { }
return null;
}
}

23
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -63,7 +63,6 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.TimePicker;
import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
import com.bumptech.glide.request.target.SimpleTarget;
@ -72,8 +71,6 @@ import com.github.stom79.mytransl.MyTransL;
import com.github.stom79.mytransl.client.HttpsConnectionException;
import com.github.stom79.mytransl.client.Results;
import com.github.stom79.mytransl.translate.Translate;
import java.io.File;
import java.io.FileOutputStream;
import java.util.ArrayList;
@ -116,7 +113,6 @@ import fr.gouv.etalab.mastodon.sqlite.Sqlite;
import fr.gouv.etalab.mastodon.sqlite.StatusCacheDAO;
import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO;
import fr.gouv.etalab.mastodon.sqlite.TempMuteDAO;
import static fr.gouv.etalab.mastodon.activities.MainActivity.currentLocale;
import static fr.gouv.etalab.mastodon.helper.Helper.THEME_BLACK;
import static fr.gouv.etalab.mastodon.helper.Helper.THEME_DARK;
@ -227,7 +223,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
@Override
public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
public void onViewAttachedToWindow(@NonNull RecyclerView.ViewHolder holder) {
super.onViewAttachedToWindow(holder);
if( holder.getItemViewType() == DISPLAYED_STATUS || holder.getItemViewType() == COMPACT_STATUS) {
final ViewHolder viewHolder = (ViewHolder) holder;
@ -466,9 +462,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if( type == RetrieveFeedsAsyncTask.Type.HOME ) {
boolean showPreview = sharedpreferences.getBoolean(Helper.SET_PREVIEW_REPLIES, false);
//Retrieves attached replies to a toot
if (showPreview && status.getReplies() == null) {
if (showPreview && status.getReblogs_count() == -1) {
new RetrieveRepliesAsyncTask(context, status, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
@ -483,9 +480,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_reply.setText("");
//Display a preview for accounts that have replied *if enabled and only for home timeline*
if( type == RetrieveFeedsAsyncTask.Type.HOME ) {
boolean showPreview = sharedpreferences.getBoolean(Helper.SET_PREVIEW_REPLIES, false);
if( showPreview){
//All way to deal with replies count
if( showPreview && status.getReblogs_count() == -1){
boolean showPreviewPP = sharedpreferences.getBoolean(Helper.SET_PREVIEW_REPLIES_PP, false);
if( status.getReplies() == null){
holder.loader_replies.setVisibility(View.VISIBLE);
@ -520,6 +519,16 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
holder.status_replies.setVisibility(View.VISIBLE);
holder.loader_replies.setVisibility(View.GONE);
}
}else if(showPreview && status.getReblogs_count() >= 0) {
if( status.getReblogs_count() > 0 ) {
holder.status_reply.setText(String.valueOf(status.getReblogs_count()));
holder.status_replies.setVisibility(View.VISIBLE);
}
boolean showPreviewPP = sharedpreferences.getBoolean(Helper.SET_PREVIEW_REPLIES_PP, false);
if (showPreviewPP && status.getReblogs_count() > 0) {
new RetrieveRepliesAsyncTask(context, status, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
status.setReblogs_count(-1);
}
}else{
holder.loader_replies.setVisibility(View.GONE);
holder.status_replies.setVisibility(View.GONE);