Skip to content

Commit affb836

Browse files
Merge pull request #2874 from nextcloud/fix/note-edit-branding-applying
fix: note edit applying branding
2 parents 088ced6 + 7960733 commit affb836

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,20 @@ protected void colorWithText(@NonNull String newText, @Nullable Integer current,
305305
public void applyBrand(int color) {
306306
super.applyBrand(color);
307307

308-
final var util = BrandingUtil.of(color, requireContext());
308+
final var context = getContext();
309+
if (context == null) {
310+
return;
311+
}
312+
313+
final var util = BrandingUtil.of(color, context);
309314

310315
lifecycleScopeIOJob(() -> {
311316
try {
312-
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());
313-
binding.editContent.setCurrentSingleSignOnAccount(ssoAccount, color);
317+
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(context);
318+
onMainThread(() -> {
319+
binding.editContent.setCurrentSingleSignOnAccount(ssoAccount, color);
320+
return Unit.INSTANCE;
321+
});
314322
} catch (Exception e) {
315323
Log_OC.e(TAG, "applyBrand exception: " + e);
316324
}

0 commit comments

Comments
 (0)