1 files changed, 26 insertions, 20 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
index fd3849980..6ded4d4db 100644
--- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
@@ -26,20 +26,20 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.PopupMenu;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -360,8 +360,9 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
         });
         //Timed muted account
         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+        String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
         final SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-        final Account authenticatedAccount = new AccountDAO(getApplicationContext(), db).getAccountByID(userId);
+        final Account authenticatedAccount = new AccountDAO(getApplicationContext(), db).getUniqAccount(userId, instance);
         boolean isTimedMute = new TempMuteDAO(getApplicationContext(), db).isTempMuted(authenticatedAccount, accountId);
         if( isTimedMute){
             String date_mute = new TempMuteDAO(getApplicationContext(), db).getMuteDateByID(authenticatedAccount, accountId);
@@ -715,12 +716,16 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
         if( (account.getAvatar() == null || account.getAvatar().equals("null"))&& MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) {
             Glide.with(getApplicationContext()).load(R.drawable.missing_peertube).apply(RequestOptions.circleCropTransform()).into(account_pp);
         }else{
+            String url = account.getAvatar();
+            if( url != null && url.startsWith("/")){
+                url = Helper.getLiveInstanceWithProtocol(ShowAccountActivity.this) + url;
+            }
             if( !disableGif)
-                Glide.with(getApplicationContext()).load(account.getAvatar()).apply(RequestOptions.circleCropTransform()).into(account_pp);
-            else
+                Glide.with(getApplicationContext()).load(url).apply(RequestOptions.circleCropTransform()).into(account_pp);
+            else {
                 Glide.with(getApplicationContext())
                         .asBitmap()
-                        .load(account.getAvatar())
+                        .load(url)
                         .into(new SimpleTarget<Bitmap>() {
                             @Override
                             public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
@@ -729,6 +734,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
                                 account_pp.setImageDrawable(circularBitmapDrawable);
                             }
                         });
+            }
         }
         account_pp.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -898,8 +904,8 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
                         DisplayAccountsFragment displayAccountsFragment = new DisplayAccountsFragment();
                         bundle.putSerializable("type", RetrieveAccountsAsyncTask.Type.CHANNELS);
                         bundle.putString("targetedid", account.getId());
-                        bundle.putString("instance",account.getAcct().split("@")[1]);
-                        bundle.putString("name",account.getAcct().split("@")[0]);
+                        bundle.putString("instance", Helper.getLiveInstance(ShowAccountActivity.this));
+                        bundle.putString("name",account.getAcct());
                         displayAccountsFragment.setArguments(bundle);
                         return displayAccountsFragment;
                     }else{