cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement deletion of files

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-06-23 17:07:59 +02:00
parent 6a5bd6509b
commit f9dea31300
21 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/CertifyResult.java
View File

@@ -132,7 +132,7 @@ public class CertifyResult extends InputPendingResult {
intent.putExtra(LogDisplayFragment.EXTRA_RESULT, CertifyResult.this);
activity.startActivity(intent);
}
}, R.string.view_log);
}, R.string.snackbar_details);
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java
View File

@@ -124,7 +124,7 @@ public class DeleteResult extends OperationResult {
intent.putExtra(LogDisplayFragment.EXTRA_RESULT, DeleteResult.this);
activity.startActivity(intent);
}
}, R.string.view_log);
}, R.string.snackbar_details);
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java
View File

@@ -190,7 +190,7 @@ public class ImportKeyResult extends OperationResult {
intent.putExtra(LogDisplayFragment.EXTRA_RESULT, ImportKeyResult.this);
activity.startActivity(intent);
}
}, R.string.view_log);
}, R.string.snackbar_details);
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
View File

@@ -253,7 +253,7 @@ public abstract class OperationResult implements Parcelable {
intent.putExtra(LogDisplayFragment.EXTRA_RESULT, OperationResult.this);
activity.startActivity(intent);
}
}, R.string.view_log);
}, R.string.snackbar_details);
}

21
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@@ -491,12 +491,28 @@ public class DecryptListFragment
askForOutputFilename(model.mInputUri, metadata.getFilename(), metadata.getMimeType());
return true;
case R.id.decrypt_delete:
Notify.create(activity, "decrypt/delete not yet implemented", Style.ERROR).show(this);
deleteFile(activity, model.mInputUri);
return true;
}
return false;
}
private void deleteFile(Activity activity, Uri uri) {
try {
int deleted = activity.getContentResolver().delete(uri, null, null);
if (deleted > 0) {
Notify.create(activity, R.string.file_delete_ok, Style.OK).show();
} else {
Notify.create(activity, R.string.file_delete_none, Style.WARN).show();
}
} catch (Exception e) {
Log.e(Constants.TAG, "exception deleting file", e);
Notify.create(activity, R.string.file_delete_exception, Style.ERROR).show();
}
}
public static class DecryptFilesAdapter extends RecyclerView.Adapter<ViewHolder> {
private Context mContext;
private ArrayList<ViewModel> mDataset;
@@ -664,9 +680,6 @@ public class DecryptListFragment
mMenuClickedModel = model;
PopupMenu menu = new PopupMenu(mContext, view);
menu.inflate(R.menu.decrypt_item_context_menu);
if (!"file".equals(model.mInputUri.getScheme())) {
menu.getMenu().findItem(R.id.decrypt_delete).setVisible(false);
}
menu.setOnMenuItemClickListener(mMenuItemClickListener);
menu.setOnDismissListener(new OnDismissListener() {
@Override