Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
247 if (this.dialogTitleResId == R.string.setup_dialog_title) | 247 if (this.dialogTitleResId == R.string.setup_dialog_title) |
248 { | 248 { |
249 this.dismissDialog(); | 249 this.dismissDialog(); |
250 } | 250 } |
251 } | 251 } |
252 } | 252 } |
253 | 253 |
254 @Override | 254 @Override |
255 public void subscriptionUpdateRequested(final boolean enabled) | 255 public void subscriptionUpdateRequested(final boolean enabled) |
256 { | 256 { |
257 this.dialog = ProgressDialog.show(this, null, enabled ? | 257 this.dialog = ProgressDialog.show(this, null, enabled ? |
anton
2017/06/26 14:45:54
would it not be better to have it like this ".. en
| |
258 getString(R.string.add_subscription_dialog_message) : getString(R.string .remove_subscription_dialog_message)); | 258 getString(R.string.add_subscription_dialog_message) : getString(R.string .remove_subscription_dialog_message)); |
259 } | 259 } |
260 | 260 |
261 @Override | 261 @Override |
262 public void subscriptionUpdatedApplied() | 262 public void subscriptionUpdatedApplied() |
263 { | 263 { |
264 if (dialog != null) | 264 this.dismissDialog(); |
265 { | |
266 dialog.dismiss(); | |
anton
2017/06/26 13:49:34
don't we need to `dialog = null` after it's dismis
jens
2017/06/26 14:05:20
Yeah, you're right. I think it's cleaner. I will u
| |
267 } | |
268 } | 265 } |
269 } | 266 } |
LEFT | RIGHT |