- Fix commit-apply analyzer issue
diff --git a/src/com/fairphone/updater/FairphoneUpdater.java b/src/com/fairphone/updater/FairphoneUpdater.java
index 02cb851..d7652c7 100644
--- a/src/com/fairphone/updater/FairphoneUpdater.java
+++ b/src/com/fairphone/updater/FairphoneUpdater.java
@@ -128,7 +128,6 @@
mIsFirstTimeAppStore = false;//mSharedPreferences.getBoolean(PREFERENCE_FIRST_TIME_APP_STORE, true);
mOtaDownloadUrl = mSharedPreferences.getString(PREFERENCE_OTA_DOWNLOAD_URL, getResources().getString(R.string.downloadUrl));
- Log.wtf("SHIT FPU ", "PREFERENCE_OTA_DOWNLOAD_URL "+mOtaDownloadUrl);
// get system data
mDeviceVersion = VersionParserHelper.getDeviceVersion(this);
@@ -142,7 +141,7 @@
boolean isConfigLoaded = UpdaterService.readUpdaterData(this);
if (!isConfigLoaded) {
- mSharedPreferences.edit().remove(UpdaterService.LAST_CONFIG_DOWNLOAD_IN_MS).commit();
+ mSharedPreferences.edit().remove(UpdaterService.LAST_CONFIG_DOWNLOAD_IN_MS).apply();
}
startService();
@@ -316,7 +315,7 @@
mIsFirstTimeFairphone = false;
editor.putBoolean(PREFERENCE_FIRST_TIME_FAIRPHONE, false);
- editor.commit();
+ editor.apply();
}
headerFairphoneInfoButton.setVisibility(showInfo ? View.VISIBLE : View.GONE);
@@ -342,7 +341,7 @@
mIsFirstTimeAndroid = false;
editor.putBoolean(PREFERENCE_FIRST_TIME_ANDROID, false);
- editor.commit();
+ editor.apply();
}
headerFairphoneInfoButton.setVisibility(View.GONE);
@@ -367,7 +366,7 @@
mIsFirstTimeAppStore = false;
editor.putBoolean(PREFERENCE_FIRST_TIME_APP_STORE, false);
- editor.commit();
+ editor.apply();
}
headerFairphoneInfoButton.setVisibility(View.GONE);
diff --git a/src/com/fairphone/updater/UpdaterService.java b/src/com/fairphone/updater/UpdaterService.java
index 8cf4bf6..0850f0f 100644
--- a/src/com/fairphone/updater/UpdaterService.java
+++ b/src/com/fairphone/updater/UpdaterService.java
@@ -183,7 +183,7 @@
// start the download of the latest file
startDownloadLatest();
- mSharedPreferences.edit().putLong(LAST_CONFIG_DOWNLOAD_IN_MS, now).commit();
+ mSharedPreferences.edit().putLong(LAST_CONFIG_DOWNLOAD_IN_MS, now).apply();
}
}
@@ -246,7 +246,7 @@
public void run() {
Log.w(TAG, "Configuration file download timed out");
mDownloadManager.remove(currentId);
- mSharedPreferences.edit().remove(LAST_CONFIG_DOWNLOAD_IN_MS).commit();
+ mSharedPreferences.edit().remove(LAST_CONFIG_DOWNLOAD_IN_MS).apply();
}
});
}
@@ -625,7 +625,7 @@
if (removeReceiver)
{
Log.d(TAG, "Configuration download failed. Clearing grace period.");
- mSharedPreferences.edit().remove(LAST_CONFIG_DOWNLOAD_IN_MS).commit();
+ mSharedPreferences.edit().remove(LAST_CONFIG_DOWNLOAD_IN_MS).apply();
removeBroadcastReceiver();
}
}
diff --git a/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java b/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
index 76467ff..6fd208f 100644
--- a/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
+++ b/src/com/fairphone/updater/fragments/DownloadAndRestartFragment.java
@@ -566,7 +566,7 @@
private void startPreInstall()
{
- Resources resources = getResources();
+ final Resources resources = getResources();
DownloadableItem item = mIsVersion ? mSelectedVersion : mSelectedStore;
File f = new File("/" + resources.getString(R.string.recoveryCachePath) + "/" + Utils.getFilenameFromDownloadableItem(item));
@@ -601,33 +601,39 @@
e.printStackTrace();
}
- Editor editor = mSharedPreferences.edit();
- editor.remove(UpdaterService.PREFERENCE_REINSTALL_GAPPS);
- editor.commit();
+ new Thread(new Runnable() {
+ @SuppressLint("CommitPrefEdits")
+ @Override
+ public void run() {
+ Editor editor = mSharedPreferences.edit();
+ editor.remove(UpdaterService.PREFERENCE_REINSTALL_GAPPS);
+ editor.commit();
- if (Utils.hasUnifiedPartition(resources))
- {
- removeLastUpdateDownload();
- }
+ if (Utils.hasUnifiedPartition(resources))
+ {
+ removeLastUpdateDownload();
+ }
- // remove the update files from data
- removeUpdateFilesFromData();
+ // remove the update files from data
+ removeUpdateFilesFromData();
- // reboot the device into recovery
- try
- {
- mainActivity.updateStatePreference(UpdaterState.NORMAL);
- mainActivity.clearSelectedItems();
- clearConfigFile();
- editor = mSharedPreferences.edit();
- editor.remove(UpdaterService.LAST_CONFIG_DOWNLOAD_IN_MS);
- editor.remove(MainFragment.SHARED_PREFERENCES_ENABLE_GAPPS);
- editor.commit();
- Shell.runRootCommand(new CommandCapture(0, "reboot recovery"));
- } catch (IOException | TimeoutException | RootDeniedException e)
- {
- e.printStackTrace();
- }
+ // reboot the device into recovery
+ try
+ {
+ mainActivity.updateStatePreference(UpdaterState.NORMAL);
+ mainActivity.clearSelectedItems();
+ clearConfigFile();
+ editor = mSharedPreferences.edit();
+ editor.remove(UpdaterService.LAST_CONFIG_DOWNLOAD_IN_MS);
+ editor.remove(MainFragment.SHARED_PREFERENCES_ENABLE_GAPPS);
+ editor.commit();
+ Shell.runRootCommand(new CommandCapture(0, "reboot recovery"));
+ } catch (IOException | TimeoutException | RootDeniedException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ }).start();
}
else
{
diff --git a/src/com/fairphone/updater/fragments/MainFragment.java b/src/com/fairphone/updater/fragments/MainFragment.java
index 70c36d0..efec4a1 100644
--- a/src/com/fairphone/updater/fragments/MainFragment.java
+++ b/src/com/fairphone/updater/fragments/MainFragment.java
@@ -112,7 +112,7 @@
Editor edit = mSharedPreferences.edit();
edit.putBoolean(SHARED_PREFERENCES_ENABLE_GAPPS, false);
- edit.commit();
+ edit.apply();
}
private void setupCurrentVersionGroup(LayoutInflater inflater, View view)
diff --git a/src/com/fairphone/updater/gappsinstaller/GappsInstallerHelper.java b/src/com/fairphone/updater/gappsinstaller/GappsInstallerHelper.java
index 7b053ff..20bea94 100644
--- a/src/com/fairphone/updater/gappsinstaller/GappsInstallerHelper.java
+++ b/src/com/fairphone/updater/gappsinstaller/GappsInstallerHelper.java
@@ -80,7 +80,7 @@
// alter State
SharedPreferences.Editor prefEdit = mSharedPrefs.edit();
prefEdit.putInt(GOOGLE_APPS_INSTALLER_STATE, state);
- prefEdit.commit();
+ prefEdit.apply();
}
void updateWidgetState(int state)