From a87c54031d09ae6493a116a3d6669517d59c57cf Mon Sep 17 00:00:00 2001 From: Catfriend1 Date: Thu, 11 Jul 2019 13:03:08 +0200 Subject: [PATCH] Override changes: Show confirmation dialog (fixes #397) --- .../syncthingandroid/views/FoldersAdapter.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java b/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java index 9b2f73228..1ab46ab30 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java @@ -1,5 +1,6 @@ package com.nutomic.syncthingandroid.views; +import android.app.AlertDialog; import android.content.Context; import android.content.Intent; import android.databinding.DataBindingUtil; @@ -189,11 +190,18 @@ private void setTextOrHide(TextView view, String text) { } private void onClickOverride(View view, Folder folder) { - // Send "Override changes" through our service to the REST API. - Intent intent = new Intent(mContext, SyncthingService.class) - .putExtra(SyncthingService.EXTRA_FOLDER_ID, folder.id); - intent.setAction(SyncthingService.ACTION_OVERRIDE_CHANGES); - mContext.startService(intent); + AlertDialog.Builder confirmDialog = new AlertDialog.Builder(mContext) + .setTitle(R.string.override_changes) + .setMessage(R.string.override_changes_question) + .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { + // Send "Override changes" through our service to the REST API. + Intent intent = new Intent(mContext, SyncthingService.class) + .putExtra(SyncthingService.EXTRA_FOLDER_ID, folder.id); + intent.setAction(SyncthingService.ACTION_OVERRIDE_CHANGES); + mContext.startService(intent); + }) + .setNegativeButton(android.R.string.no, (dialogInterface, i) -> {}); + confirmDialog.show(); } }