Skip to content

[stable-4.4] BugFix - BaseNoteFragment Lifecycle Calls #2775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 2 commits into from
Aug 5, 2025
+73 −42
Merged

[stable-4.4] BugFix - BaseNoteFragment Lifecycle Calls #2775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff19626
fix lifecycle calls thus onNoteUpdated will get note always
alperozturk96 Aug 4, 2025
f7fd410
npe check
alperozturk96 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 69 additions & 41 deletions app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,54 +98,82 @@ public void onAttach(@NonNull Context context) {
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
executor.submit(() -> {
setHasOptionsMenu(true);

executor.execute(() -> {
try {
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(requireContext().getApplicationContext());
this.localAccount = repo.getAccountByName(ssoAccount.name);

if (savedInstanceState == null) {
final long id = requireArguments().getLong(PARAM_NOTE_ID);
if (id > 0) {
final long accountId = requireArguments().getLong(PARAM_ACCOUNT_ID);
if (accountId > 0) {
/* Switch account if account id has been provided */
this.localAccount = repo.getAccountById(accountId);
SingleAccountHelper.commitCurrentAccount(requireContext().getApplicationContext(), localAccount.getAccountName());
}
isNew = false;
note = originalNote = repo.getNoteById(id);
requireActivity().runOnUiThread(() -> onNoteLoaded(note));
requireActivity().invalidateOptionsMenu();
} else {
final var paramNote = (Note) requireArguments().getSerializable(PARAM_NEWNOTE);
final var content = requireArguments().getString(PARAM_CONTENT);
if (paramNote == null) {
if (content == null) {
throw new IllegalArgumentException(PARAM_NOTE_ID + " is not given, argument " + PARAM_NEWNOTE + " is missing and " + PARAM_CONTENT + " is missing.");
} else {
note = new Note(-1, null, Calendar.getInstance(), NoteUtil.generateNoteTitle(content), content, getString(R.string.category_readonly), false, null, DBStatus.VOID, -1, "", 0, false, false);
requireActivity().runOnUiThread(() -> onNoteLoaded(note));
requireActivity().invalidateOptionsMenu();
}
} else {
paramNote.setStatus(DBStatus.LOCAL_EDITED);
note = repo.addNote(localAccount.getId(), paramNote);
originalNote = null;
requireActivity().runOnUiThread(() -> onNoteLoaded(note));
requireActivity().invalidateOptionsMenu();
}
}
initializeAccount();

if (savedInstanceState != null) {
loadFromSavedState(savedInstanceState);
} else {
note = (Note) savedInstanceState.getSerializable(SAVEDKEY_NOTE);
originalNote = (Note) savedInstanceState.getSerializable(SAVEDKEY_ORIGINAL_NOTE);
requireActivity().runOnUiThread(() -> onNoteLoaded(note));
requireActivity().invalidateOptionsMenu();
loadFromArguments();
}

requireActivity().runOnUiThread(() -> {
onNoteLoaded(note);
requireActivity().invalidateOptionsMenu();

if (listener != null) {
listener.onNoteUpdated(note);
}
});
} catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
Log_OC.e(TAG, e.getLocalizedMessage());
}
});
setHasOptionsMenu(true);
}

private void initializeAccount() throws NextcloudFilesAppAccountNotFoundException, NoCurrentAccountSelectedException {
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(requireContext().getApplicationContext());
this.localAccount = repo.getAccountByName(ssoAccount.name);
}

private void loadFromSavedState(Bundle savedInstanceState) {
note = (Note) savedInstanceState.getSerializable(SAVEDKEY_NOTE);
originalNote = (Note) savedInstanceState.getSerializable(SAVEDKEY_ORIGINAL_NOTE);
}

private void loadFromArguments() {
final long noteId = requireArguments().getLong(PARAM_NOTE_ID);

if (noteId > 0) {
loadExistingNote(noteId);
} else {
createNewNote();
}
}

private void loadExistingNote(long noteId) {
// Switch account if provided
final long accountId = requireArguments().getLong(PARAM_ACCOUNT_ID);
if (accountId > 0) {
this.localAccount = repo.getAccountById(accountId);
SingleAccountHelper.commitCurrentAccount(requireContext().getApplicationContext(), localAccount.getAccountName());
}

isNew = false;
note = originalNote = repo.getNoteById(noteId);
}

private void createNewNote() {
final var paramNote = (Note) requireArguments().getSerializable(PARAM_NEWNOTE);
final var content = requireArguments().getString(PARAM_CONTENT);

if (paramNote != null) {
// Create from provided note
paramNote.setStatus(DBStatus.LOCAL_EDITED);
note = repo.addNote(localAccount.getId(), paramNote);
originalNote = null;
} else if (content != null) {
// Create from content string
note = new Note(-1, null, Calendar.getInstance(),
NoteUtil.generateNoteTitle(content), content,
getString(R.string.category_readonly), false, null,
DBStatus.VOID, -1, "", 0, false, false);
} else {
throw new IllegalArgumentException("Missing required parameters: noteId, newNote, or content");
}
}

@Nullable
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ protected void onCreate(final Bundle savedInstanceState) {

binding = ActivityEditBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
setSupportActionBar(binding.toolbar);

if (savedInstanceState == null) {
launchNoteFragment();
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/it/niedermann/owncloud/notes/persistence/DirectEditingRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ class DirectEditingRepository private constructor(private val applicationContext
return notesPath
.flatMap { notesPath ->
val filesAPI = apiProvider.getFilesAPI(applicationContext, account)
if (filesAPI == null) {
return@flatMap null
}

Single.fromCallable {
val call =
filesAPI.getDirectEditingUrl(
Expand Down
Loading