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

Fix federation issue

This commit is contained in:
tom79 2019-07-26 12:37:03 +02:00
parent 0dff65192a
commit 85bee6c02b
2 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/app/fedilab/android/helper/CrossActions.java
View File

@ -349,7 +349,7 @@ public class CrossActions {
Account fetchedAccount = null;
if( remoteAccounts.size() == 1){
Account acc = remoteAccounts.get(0);
if (acc.getUsername().equals(remoteAccount.getUsername())) {
if (remoteAccount.getUsername() == null || acc.getUsername().equals(remoteAccount.getUsername())) {
fetchedAccount = acc;
}
}else {
@ -364,12 +364,12 @@ public class CrossActions {
e.printStackTrace();
}
if( instance != null ) {
if (acc.getUsername().equals(remoteAccount.getUsername()) && instance.equals(remoteAccount.getInstance())) {
if ((acc.getUsername()).equals(remoteAccount.getAcct())) {
fetchedAccount = acc;
break;
}
}else{
if (acc.getUsername().equals(remoteAccount.getUsername())) {
if (acc.getAcct().equals(remoteAccount.getAcct())) {
fetchedAccount = acc;
break;
}

45
app/src/main/java/app/fedilab/android/helper/EmojiDrawableSpan.java
View File

@ -1,45 +0,0 @@
package app.fedilab.android.helper;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.text.style.DynamicDrawableSpan;
import android.util.Log;
import androidx.annotation.DrawableRes;
import com.github.pengfeizhou.animation.apng.APNGDrawable;
import org.jetbrains.annotations.NotNull;
public class EmojiDrawableSpan extends DynamicDrawableSpan {
private APNGDrawable mDrawable;
private int size;
public EmojiDrawableSpan(Context context, APNGDrawable apngDrawable) {
mDrawable = apngDrawable;
size = (int) Helper.convertDpToPixel(20, context);
}
@Override
public Drawable getDrawable() {
return mDrawable;
}
@Override
public void draw(@NotNull Canvas canvas, CharSequence text,
int start, int end, float x,
int top, int y, int bottom, @NotNull Paint paint) {
Drawable b = mDrawable;
canvas.save();
int transY = bottom - b.getBounds().bottom;
canvas.translate(x, transY);
mDrawable.setBounds(0, 0, size, size);
b.draw(canvas);
canvas.restore();
mDrawable.start();
}
}