Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f8a913 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

refactor avatarURL generation

parent e84c98ad

app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import it.niedermann.owncloud.notes.databinding.DialogAccountSwitcherBinding; 
import it.niedermann.owncloud.notes.manageaccounts.ManageAccountsActivity;

import it.niedermann.owncloud.notes.persistence.NotesRepository;

import it.niedermann.owncloud.notes.persistence.entity.Account;

import it.niedermann.owncloud.notes.shared.util.SSOUtil;

import it.niedermann.owncloud.notes.shared.util.DisplayUtils;



/**

 * Displays all available {@link Account} entries and provides basic operations for them, like adding or switching
@@ -68,7 +68,7 @@ public class AccountSwitcherDialog extends BrandedDialogFragment { 
            binding.accountName.setText(currentLocalAccount.getDisplayName());

            binding.accountHost.setText(Uri.parse(currentLocalAccount.getUrl()).getHost());

            Glide.with(requireContext())

                    .load(currentLocalAccount.getUrl() + "/index.php/avatar/" + Uri.encode(SSOUtil.sanitizeUserId(currentLocalAccount.getUserName())) + "/64")

                    .load(DisplayUtils.getAvatarUrl(currentLocalAccount))

                    .error(R.drawable.ic_account_circle_grey_24dp)

                    .apply(RequestOptions.circleCropTransform())

                    .into(binding.currentAccountItemAvatar);

app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherViewHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl; 
import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;

import it.niedermann.owncloud.notes.persistence.entity.Account;

import it.niedermann.owncloud.notes.shared.util.SSOUtil;

import it.niedermann.owncloud.notes.shared.util.DisplayUtils;



public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder {
@@ -29,7 +29,7 @@ public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder { 
        binding.accountName.setText(localAccount.getDisplayName());

        binding.accountHost.setText(Uri.parse(localAccount.getUrl()).getHost());

        Glide.with(itemView.getContext())

                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(SSOUtil.sanitizeUserId(localAccount.getUserName())) + "/64"))

                .load(new SingleSignOnUrl(localAccount.getAccountName(), DisplayUtils.getAvatarUrl(localAccount)))

                .placeholder(R.drawable.ic_account_circle_grey_24dp)

                .error(R.drawable.ic_account_circle_grey_24dp)

                .apply(RequestOptions.circleCropTransform())

app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ import android.accounts.NetworkErrorException; 
import android.animation.AnimatorInflater;

import android.app.SearchManager;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.text.TextUtils;

import android.view.View;
@@ -92,8 +91,8 @@ import it.niedermann.owncloud.notes.shared.model.IResponseCallback; 
import it.niedermann.owncloud.notes.shared.model.NavigationCategory;

import it.niedermann.owncloud.notes.shared.model.NoteClickListener;

import it.niedermann.owncloud.notes.shared.util.CustomAppGlideModule;

import it.niedermann.owncloud.notes.shared.util.DisplayUtils;

import it.niedermann.owncloud.notes.shared.util.NoteUtil;

import it.niedermann.owncloud.notes.shared.util.SSOUtil;

import it.niedermann.owncloud.notes.shared.util.ShareUtil;

import trikita.log.Log;
@@ -308,7 +307,7 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 
            fabCreate.hide();

            Glide

                    .with(this)

                    .load(nextAccount.getUrl() + "/index.php/avatar/" + Uri.encode(SSOUtil.sanitizeUserId(nextAccount.getUserName())) + "/64")

                    .load(DisplayUtils.getAvatarUrl(nextAccount))

                    .placeholder(R.drawable.ic_account_circle_grey_24dp)

                    .error(R.drawable.ic_account_circle_grey_24dp)

                    .apply(RequestOptions.circleCropTransform())

app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import it.niedermann.owncloud.notes.R; 
import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;

import it.niedermann.owncloud.notes.persistence.entity.Account;

import it.niedermann.owncloud.notes.shared.util.AccountSyncUtil;

import it.niedermann.owncloud.notes.shared.util.SSOUtil;

import it.niedermann.owncloud.notes.shared.util.DisplayUtils;



public class ManageAccountViewHolder extends RecyclerView.ViewHolder {
@@ -40,7 +40,7 @@ public class ManageAccountViewHolder extends RecyclerView.ViewHolder { 
        binding.accountName.setText(localAccount.getUserName());

        binding.accountHost.setText(Uri.parse(localAccount.getUrl()).getHost());

        Glide.with(itemView.getContext())

                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(SSOUtil.sanitizeUserId(localAccount.getUserName())) + "/64"))

                .load(new SingleSignOnUrl(localAccount.getAccountName(), DisplayUtils.getAvatarUrl(localAccount)))

                .error(R.drawable.ic_account_circle_grey_24dp)

                .apply(RequestOptions.circleCropTransform())

                .into(binding.accountItemAvatar);

app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ import it.niedermann.nextcloud.sso.glide.SingleSignOnUrl; 
import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.databinding.ItemAccountChooseBinding;

import it.niedermann.owncloud.notes.persistence.entity.Account;

import it.niedermann.owncloud.notes.shared.util.SSOUtil;

import it.niedermann.owncloud.notes.shared.util.DisplayUtils;



public class AccountChooserViewHolder extends RecyclerView.ViewHolder {

    private final ItemAccountChooseBinding binding;
@@ -25,7 +25,7 @@ public class AccountChooserViewHolder extends RecyclerView.ViewHolder { 
    public void bind(Account localAccount, Consumer<Account> targetAccountConsumer) {

        Glide

                .with(binding.accountItemAvatar.getContext())

                .load(new SingleSignOnUrl(localAccount.getAccountName(), localAccount.getUrl() + "/index.php/avatar/" + Uri.encode(SSOUtil.sanitizeUserId(localAccount.getUserName())) + "/64"))

                .load(new SingleSignOnUrl(localAccount.getAccountName(), DisplayUtils.getAvatarUrl(localAccount)))

                .placeholder(R.drawable.ic_account_circle_grey_24dp)

                .error(R.drawable.ic_account_circle_grey_24dp)

                .apply(RequestOptions.circleCropTransform())