Skip to content

Commit c4f93ff

Browse files
committed
npe checks
Signed-off-by: alperozturk <[email protected]>
1 parent b7a475b commit c4f93ff

File tree

1 file changed

+35
-11
lines changed

1 file changed

+35
-11
lines changed

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

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
3333
import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
3434
import com.nextcloud.android.sso.helper.SingleAccountHelper;
35+
import com.owncloud.android.lib.common.utils.Log_OC;
3536

3637
import java.util.ArrayList;
3738
import java.util.Calendar;
@@ -141,7 +142,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
141142
requireActivity().invalidateOptionsMenu();
142143
}
143144
} catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
144-
e.printStackTrace();
145+
Log_OC.e(TAG, e.getLocalizedMessage());
145146
}
146147
});
147148
setHasOptionsMenu(true);
@@ -240,16 +241,26 @@ public boolean onOptionsItemSelected(MenuItem item) {
240241
repo.updateNoteAndSync(localAccount, originalNote, null, null, null);
241242
}
242243
});
243-
listener.close();
244+
245+
if (listener != null) {
246+
listener.close();
247+
}
244248
return true;
245249
} else if (itemId == R.id.menu_delete) {
246250
repo.deleteNoteAndSync(localAccount, note.getId());
247-
listener.close();
251+
252+
if (listener != null) {
253+
listener.close();
254+
}
248255
return true;
249256
} else if (itemId == R.id.menu_favorite) {
250257
note.setFavorite(!note.getFavorite());
251258
repo.toggleFavoriteAndSync(localAccount, note);
252-
listener.onNoteUpdated(note);
259+
260+
if (listener != null) {
261+
listener.onNoteUpdated(note);
262+
}
263+
253264
prepareFavoriteOption(item);
254265
return true;
255266
} else if (itemId == R.id.menu_category) {
@@ -288,22 +299,35 @@ public boolean onOptionsItemSelected(MenuItem item) {
288299
}
289300

290301
protected void shareNote() {
302+
if (note == null) {
303+
Log_OC.w(TAG, "Note is null in shareNote");
304+
return;
305+
}
306+
291307
ShareUtil.openShareDialog(requireContext(), note.getTitle(), note.getContent());
292308
}
293309

294310
@CallSuper
295311
protected void onNoteLoaded(Note note) {
312+
if (note == null) {
313+
Log_OC.w(TAG, "Note is null in onNoteLoaded");
314+
return;
315+
}
316+
296317
this.originalScrollY = note.getScrollY();
297318
scrollToY(originalScrollY);
298319
final var scrollView = getScrollView();
299-
if (scrollView != null) {
300-
scrollView.setOnScrollChangeListener((View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) -> {
301-
if (scrollY > 0) {
302-
note.setScrollY(scrollY);
303-
}
304-
onScroll(scrollY, oldScrollY);
305-
});
320+
if (scrollView == null) {
321+
Log_OC.w(TAG, "Scroll view is null, onNoteLoaded");
322+
return;
306323
}
324+
325+
scrollView.setOnScrollChangeListener((View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) -> {
326+
if (scrollY > 0) {
327+
note.setScrollY(scrollY);
328+
}
329+
onScroll(scrollY, oldScrollY);
330+
});
307331
}
308332

309333
/**

0 commit comments

Comments
 (0)