summaryrefslogtreecommitdiff
path: root/app/src/fatweb/java
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2023-10-31 18:40:55 +0000
committercyberta <cyberta@riseup.net>2023-10-31 18:40:55 +0000
commite62532bb0b2f57293edf18ae82afab5f3c8621e7 (patch)
treeb3b8259dd475882d8c87c0aac54488866fc2e76c /app/src/fatweb/java
parent2274d71a7942d5a89a27918b28041dae5be3816a (diff)
parentbd00c1d8385db2fb6de07fa17349f0bfb260b1a7 (diff)
Merge branch 'update_dependencies_2' into 'master'
Update dependencies Closes #9041 See merge request leap/bitmask_android!259
Diffstat (limited to 'app/src/fatweb/java')
-rw-r--r--app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadBroadcastReceiver.java22
-rw-r--r--app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/InstallActivity.java2
2 files changed, 12 insertions, 12 deletions
diff --git a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadBroadcastReceiver.java b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadBroadcastReceiver.java
index 5591454b..1c689566 100644
--- a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadBroadcastReceiver.java
+++ b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/DownloadBroadcastReceiver.java
@@ -16,16 +16,6 @@
*/
package se.leap.bitmaskclient.appUpdate;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.Toast;
-
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.base.models.Constants;
-import se.leap.bitmaskclient.base.utils.PreferenceHelper;
-
import static android.app.Activity.RESULT_CANCELED;
import static se.leap.bitmaskclient.appUpdate.DownloadService.DOWNLOAD_PROGRESS;
import static se.leap.bitmaskclient.appUpdate.DownloadService.NO_NEW_VERISON;
@@ -39,6 +29,16 @@ import static se.leap.bitmaskclient.appUpdate.DownloadServiceCommand.DOWNLOAD_UP
import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_DOWNLOAD_SERVICE_EVENT;
import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_CODE;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.base.models.Constants;
+import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+
public class DownloadBroadcastReceiver extends BroadcastReceiver {
public static final String ACTION_DOWNLOAD = "se.leap.bitmaskclient.appUpdate.ACTION_DOWNLOAD";
@@ -69,7 +69,7 @@ public class DownloadBroadcastReceiver extends BroadcastReceiver {
break;
case UPDATE_NOT_FOUND:
if (resultData.getBoolean(NO_NEW_VERISON, false)) {
- PreferenceHelper.setLastAppUpdateCheck(context.getApplicationContext());
+ PreferenceHelper.setLastAppUpdateCheck();
}
break;
case UPDATE_DOWNLOADED:
diff --git a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/InstallActivity.java b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/InstallActivity.java
index 69c6feb3..92291a43 100644
--- a/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/InstallActivity.java
+++ b/app/src/fatweb/java/se.leap.bitmaskclient/appUpdate/InstallActivity.java
@@ -55,7 +55,7 @@ public class InstallActivity extends Activity {
}
protected void installUpdate() {
- PreferenceHelper.restartOnUpdate(this.getApplicationContext(), true);
+ PreferenceHelper.restartOnUpdate(true);
Intent installIntent = new Intent(Intent.ACTION_VIEW);
File update = UpdateDownloadManager.getUpdateFile(this.getApplicationContext());