RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added disabling cancel button in restoring progress dialog while restore filase are being applied

Browse source
This commit is contained in:
Alexander Zatsepin 2018-05-08 16:17:52 +03:00 • committed by Aleksandr Zatsepin
parent a2056fbbb4
commit 81ad9814ab
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java
View file

@ -7,6 +7,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentActivity;
import android.view.View;
import android.widget.Button;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
@ -281,8 +282,8 @@ public class BookmarkBackupController implements Authorizer.Callback,
DialogInterface.OnClickListener clickListener
= (dialog, which) -> requestRestoring();
DialogUtils.showAlertDialog(mContext, R.string.error_server_title,
mContext.getString(R.string.error_server_message),
R.string.try_again, clickListener, R.string.cancel);
R.string.error_server_message, R.string.try_again,
clickListener, R.string.cancel);
break;
case CLOUD_DISK_ERROR:
DialogUtils.showAlertDialog(mContext, R.string.dialog_routing_system_error,
@ -325,7 +326,7 @@ public class BookmarkBackupController implements Authorizer.Callback,
break;
case CLOUD_NO_BACKUP:
DialogUtils.showAlertDialog(mContext, R.string.bookmarks_restore_empty_title,
mContext.getString(R.string.bookmarks_restore_empty_message),
R.string.bookmarks_restore_empty_message,
R.string.ok, cancelListener);
break;
case CLOUD_NOT_ENOUGH_DISK_SPACE:
@ -345,5 +346,13 @@ public class BookmarkBackupController implements Authorizer.Callback,
public void onRestoredFilesPrepared()
{
LOGGER.d(TAG, "onRestoredFilesPrepared()");
if (mRestoringProgressDialog == null || !mRestoringProgressDialog.isShowing())
return;
Button cancelButton = mRestoringProgressDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
if (cancelButton == null)
throw new AssertionError("Restoring progress dialog must contain cancel button!");
cancelButton.setEnabled(false);
}
}

4
android/src/com/mapswithme/util/DialogUtils.java
View file

@ -106,10 +106,10 @@ public class DialogUtils
}
public static void showAlertDialog(@NonNull Context context, @StringRes int titleId,
@NonNull CharSequence msg, @StringRes int posBtn,
@StringRes int msgId, @StringRes int posBtn,
@NonNull DialogInterface.OnClickListener posClickListener)
{
buildAlertDialog(context, titleId, msg, posBtn, posClickListener).show();
buildAlertDialog(context, titleId, context.getString(msgId), posBtn, posClickListener).show();
}