Skip to content
Snippets Groups Projects
Commit f08d2e6f authored by cyberta's avatar cyberta
Browse files

fix regression in fatweb builds after switch to encrypted shared preferences

parent 3197444d
No related branches found
No related tags found
1 merge request!259Update dependencies
...@@ -16,16 +16,6 @@ ...@@ -16,16 +16,6 @@
*/ */
package se.leap.bitmaskclient.appUpdate; 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 android.app.Activity.RESULT_CANCELED;
import static se.leap.bitmaskclient.appUpdate.DownloadService.DOWNLOAD_PROGRESS; import static se.leap.bitmaskclient.appUpdate.DownloadService.DOWNLOAD_PROGRESS;
import static se.leap.bitmaskclient.appUpdate.DownloadService.NO_NEW_VERISON; import static se.leap.bitmaskclient.appUpdate.DownloadService.NO_NEW_VERISON;
...@@ -39,6 +29,16 @@ import static se.leap.bitmaskclient.appUpdate.DownloadServiceCommand.DOWNLOAD_UP ...@@ -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_DOWNLOAD_SERVICE_EVENT;
import static se.leap.bitmaskclient.base.models.Constants.BROADCAST_RESULT_CODE; 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 class DownloadBroadcastReceiver extends BroadcastReceiver {
public static final String ACTION_DOWNLOAD = "se.leap.bitmaskclient.appUpdate.ACTION_DOWNLOAD"; public static final String ACTION_DOWNLOAD = "se.leap.bitmaskclient.appUpdate.ACTION_DOWNLOAD";
...@@ -69,7 +69,7 @@ public class DownloadBroadcastReceiver extends BroadcastReceiver { ...@@ -69,7 +69,7 @@ public class DownloadBroadcastReceiver extends BroadcastReceiver {
break; break;
case UPDATE_NOT_FOUND: case UPDATE_NOT_FOUND:
if (resultData.getBoolean(NO_NEW_VERISON, false)) { if (resultData.getBoolean(NO_NEW_VERISON, false)) {
PreferenceHelper.setLastAppUpdateCheck(context.getApplicationContext()); PreferenceHelper.setLastAppUpdateCheck();
} }
break; break;
case UPDATE_DOWNLOADED: case UPDATE_DOWNLOADED:
......
...@@ -55,7 +55,7 @@ public class InstallActivity extends Activity { ...@@ -55,7 +55,7 @@ public class InstallActivity extends Activity {
} }
protected void installUpdate() { protected void installUpdate() {
PreferenceHelper.restartOnUpdate(this.getApplicationContext(), true); PreferenceHelper.restartOnUpdate(true);
Intent installIntent = new Intent(Intent.ACTION_VIEW); Intent installIntent = new Intent(Intent.ACTION_VIEW);
File update = UpdateDownloadManager.getUpdateFile(this.getApplicationContext()); File update = UpdateDownloadManager.getUpdateFile(this.getApplicationContext());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment