mirror of
https://github.com/nextcloud/notes-android.git
synced 2024-10-24 21:55:52 +03:00
Fix NullPointerException
on Returning from NoteActivity to NoteListViewActivity without deleting or editing a note.
This commit is contained in:
parent
f4fabaf299
commit
e8b27ccf97
2 changed files with 9 additions and 9 deletions
|
@ -5,7 +5,6 @@ import android.os.Bundle;
|
|||
import android.support.v7.app.ActionBar;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.text.format.DateUtils;
|
||||
import android.util.Log;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
|
@ -100,7 +99,6 @@ public class NoteActivity extends AppCompatActivity implements View.OnClickListe
|
|||
|
||||
@Override
|
||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
Log.v("Note", "RequestCode: " + requestCode + " ResultCode: " + resultCode);
|
||||
// Check which request we're responding to
|
||||
if (requestCode == EDIT_NOTE_CMD) {
|
||||
// Make sure the request was successful
|
||||
|
|
|
@ -264,13 +264,15 @@ public class NotesListViewActivity extends AppCompatActivity implements
|
|||
adapter.insert(createdNote, 0);
|
||||
}
|
||||
} else if (requestCode == show_single_note_cmd) {
|
||||
int notePosition = data.getExtras().getInt(
|
||||
SELECTED_NOTE_POSITION);
|
||||
adapter.remove(adapter.getItem(notePosition));
|
||||
if (resultCode == RESULT_OK) {
|
||||
Note editedNote = (Note) data.getExtras().getSerializable(
|
||||
NoteActivity.EDIT_NOTE);
|
||||
adapter.insert(editedNote, 0);
|
||||
if (resultCode == RESULT_OK || resultCode == RESULT_FIRST_USER) {
|
||||
int notePosition = data.getExtras().getInt(
|
||||
SELECTED_NOTE_POSITION);
|
||||
adapter.remove(adapter.getItem(notePosition));
|
||||
if (resultCode == RESULT_OK) {
|
||||
Note editedNote = (Note) data.getExtras().getSerializable(
|
||||
NoteActivity.EDIT_NOTE);
|
||||
adapter.insert(editedNote, 0);
|
||||
}
|
||||
}
|
||||
} else if (requestCode == server_settings) {
|
||||
// Create new Instance with new URL and credentials
|
||||
|
|
Loading…
Reference in a new issue