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

Fix errors

This commit is contained in:
stom79 2018-11-21 18:40:02 +01:00
parent bd6e2e521a
commit d16db9dcba
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
View File

@ -27,6 +27,7 @@ import android.support.v7.app.ActionBar;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@ -108,6 +109,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetriev
}
if( detailsStatus == null || detailsStatus.getId() == null)
finish();
Log.v(Helper.TAG,"detailsStatus: " + detailsStatus);
if( getSupportActionBar() != null)
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

17
app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Account.java
View File

@ -87,7 +87,6 @@ public class Account implements Parcelable {
private boolean muting_notifications;
private int metaDataSize;
private int metaDataSizeVerified;
private int metaDataSpanSize;
private LinkedHashMap<String, String> fields;
private LinkedHashMap<String, Boolean> fieldsVerified;
private LinkedHashMap<SpannableString, SpannableString> fieldsSpan;
@ -133,14 +132,6 @@ public class Account implements Parcelable {
Boolean value = in.readByte() != 0;
fieldsVerified.put(key,value);
}
metaDataSpanSize = in.readInt();
for(int i = 0; i < metaDataSpanSize; i++){
if( fieldsSpan == null)
fieldsSpan = new LinkedHashMap<>();
SpannableString key = (SpannableString) TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
SpannableString value = (SpannableString) TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
fieldsSpan.put(key,value);
}
}
@ -182,14 +173,6 @@ public class Account implements Parcelable {
dest.writeByte((byte) (entry.getValue() ? 1 : 0));
}
}
if( fieldsSpan != null) {
metaDataSpanSize = fieldsSpan.size();
dest.writeInt(metaDataSpanSize);
for (Map.Entry<SpannableString, SpannableString> entry : fieldsSpan.entrySet()) {
TextUtils.writeToParcel(entry.getKey(), dest, flags);
TextUtils.writeToParcel(entry.getValue(), dest, flags);
}
}
}
public followAction getFollowType() {

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

@ -42,6 +42,7 @@ import android.text.SpannableString;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.MenuItem;
@ -702,6 +703,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
b.putParcelable("status", status);
else
b.putParcelable("status", status.getReblog());
Log.v(Helper.TAG,"status.getReblog(): " + status.getReblog());
intent.putExtras(b);
if (type == RetrieveFeedsAsyncTask.Type.CONTEXT)
((Activity) context).finish();