Skip to content

Commit 3569e39

Browse files
fix: Update deprecated method call
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent 2f862c4 commit 3569e39

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
3535
import com.google.android.material.floatingactionbutton.FloatingActionButton;
36+
import com.nextcloud.android.sso.helper.SingleAccountHelper;
3637
import com.owncloud.android.lib.common.utils.Log_OC;
3738

3839
import it.niedermann.owncloud.notes.R;
@@ -42,7 +43,6 @@
4243
import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
4344
import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
4445
import kotlin.Unit;
45-
import kotlin.jvm.functions.Function0;
4646

4747
public class NoteEditFragment extends SearchableBaseNoteFragment {
4848

@@ -306,7 +306,17 @@ public void applyBrand(int color) {
306306
super.applyBrand(color);
307307

308308
final var util = BrandingUtil.of(color, requireContext());
309-
binding.editContent.setSearchColor(color);
309+
310+
lifecycleScopeIOJob(() -> {
311+
try {
312+
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());
313+
binding.editContent.setCurrentSingleSignOnAccount(ssoAccount, color);
314+
} catch (Exception e) {
315+
Log_OC.e(TAG, "applyBrand exception: " + e);
316+
}
317+
return Unit.INSTANCE;
318+
});
319+
310320
binding.editContent.setHighlightColor(util.notes.getTextHighlightBackgroundColor(requireContext(), color, colorPrimary, colorAccent));
311321
}
312322

app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,15 @@
3131

3232
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
3333
import com.google.android.material.floatingactionbutton.FloatingActionButton;
34-
import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
35-
import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
3634
import com.nextcloud.android.sso.helper.SingleAccountHelper;
3735
import com.owncloud.android.lib.common.utils.Log_OC;
3836

3937
import it.niedermann.owncloud.notes.R;
4038
import it.niedermann.owncloud.notes.branding.BrandingUtil;
4139
import it.niedermann.owncloud.notes.databinding.FragmentNotePreviewBinding;
4240
import it.niedermann.owncloud.notes.persistence.entity.Note;
43-
import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
4441
import it.niedermann.owncloud.notes.shared.util.SSOUtil;
4542
import kotlin.Unit;
46-
import kotlin.jvm.functions.Function0;
4743

4844
public class NotePreviewFragment extends SearchableBaseNoteFragment implements OnRefreshListener {
4945

@@ -233,7 +229,17 @@ public void applyBrand(int color) {
233229
super.applyBrand(color);
234230

235231
final var util = BrandingUtil.of(color, requireContext());
236-
binding.singleNoteContent.setSearchColor(color);
232+
233+
lifecycleScopeIOJob(() -> {
234+
try {
235+
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());
236+
binding.singleNoteContent.setCurrentSingleSignOnAccount(ssoAccount, color);
237+
} catch (Exception e) {
238+
Log_OC.e(TAG, "applyBrand exception: " + e);
239+
}
240+
return Unit.INSTANCE;
241+
});
242+
237243
binding.singleNoteContent.setHighlightColor(util.notes.getTextHighlightBackgroundColor(requireContext(), color, colorPrimary, colorAccent));
238244
}
239245

0 commit comments

Comments
 (0)