mirror of
https://github.com/leanote/leanote-android.git
synced 2025-10-17 16:07:48 +00:00
Merge pull request #9 from leanote/bugfix/delete-note
修复ActionMode模式下,删除笔记,点击删除,list为null的错误
This commit is contained in:
@@ -199,6 +199,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
|
|||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
|
mActionModeHandler.getPendingItems().clear();
|
||||||
mActionModeHandler.dismiss();
|
mActionModeHandler.dismiss();
|
||||||
deleteNote(waitToDelete);
|
deleteNote(waitToDelete);
|
||||||
}
|
}
|
||||||
|
@@ -197,6 +197,7 @@ public class SearchActivity extends BaseActivity implements NoteAdapter.NoteAdap
|
|||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
|
mActionModeHandler.getPendingItems().clear();
|
||||||
mActionModeHandler.dismiss();
|
mActionModeHandler.dismiss();
|
||||||
deleteNote(waitToDelete);
|
deleteNote(waitToDelete);
|
||||||
}
|
}
|
||||||
|
@@ -43,11 +43,7 @@ public class ActionModeHandler<T> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
|
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
|
||||||
boolean isProceed = mCallback.onAction(item.getItemId(), mPendingItems);
|
return mCallback.onAction(item.getItemId(), mPendingItems);
|
||||||
if (isProceed) {
|
|
||||||
mPendingItems.clear();
|
|
||||||
}
|
|
||||||
return isProceed;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -66,6 +62,10 @@ public class ActionModeHandler<T> {
|
|||||||
mCallback = callback;
|
mCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<T> getPendingItems() {
|
||||||
|
return mPendingItems;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param item
|
* @param item
|
||||||
|
Reference in New Issue
Block a user