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

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

Revert "Remove nc-sso-glide library" 

This reverts commit ce3f0b26.
parent cc1bbc41

app/build.gradle

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ dependencies { 
    implementation ('com.github.stefan-niedermann:android-commons:0.2.7') {

        exclude group: 'com.github.nextcloud', module: 'Android-SingleSignOn'

    }

    implementation ('com.github.stefan-niedermann.nextcloud-commons:sso-glide:1.6.4') {

        exclude group: 'com.github.nextcloud', module: 'Android-SingleSignOn'

    }

    implementation ('com.github.stefan-niedermann.nextcloud-commons:exception:1.6.4') {

        exclude group: 'com.github.nextcloud', module: 'Android-SingleSignOn'

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 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.DisplayUtils;



/**

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

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

            Glide.with(requireContext())

                    .load(DisplayUtils.getAvatarUrl(currentLocalAccount))

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

                    .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
@@ -10,10 +10,10 @@ import androidx.recyclerview.widget.RecyclerView; 
import com.bumptech.glide.Glide;

import com.bumptech.glide.request.RequestOptions;



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.DisplayUtils;



public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder {
@@ -28,7 +28,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(DisplayUtils.getAvatarUrl(localAccount))

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

                .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

+1 −2
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 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.ShareUtil;

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

            Glide

                    .with(this)

                    .load(DisplayUtils.getAvatarUrl(nextAccount))

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

                    .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
@@ -16,11 +16,11 @@ import androidx.recyclerview.widget.RecyclerView; 
import com.bumptech.glide.Glide;

import com.bumptech.glide.request.RequestOptions;



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.AccountSyncUtil;

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



public class ManageAccountViewHolder extends RecyclerView.ViewHolder {
@@ -39,7 +39,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(DisplayUtils.getAvatarUrl(localAccount))

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

                .error(R.drawable.ic_account_circle_grey_24dp)

                .apply(RequestOptions.circleCropTransform())

                .into(binding.accountItemAvatar);