From 6b9ca8e38bb08ac20ac41eba45f5dc0d81773fae Mon Sep 17 00:00:00 2001 From: althafvly Date: Thu, 22 Dec 2022 13:35:02 +0530 Subject: [PATCH 1/2] Updater: Check for free space on install Change-Id: Ifb3385c879755dff6686f3f422fa95f80cfc1e99 --- res/values/strings.xml | 2 ++ .../lineageos/updater/UpdatesListAdapter.java | 13 ++++++++++++- src/org/lineageos/updater/misc/Utils.java | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index bdcb97a7..9ad6749a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -61,6 +61,8 @@ Preliminary update preparation Low battery The battery level is too low, you need at least %1$d%% of the battery to continue, %2$d%% if charging. + Free up space + The update cannot be completed because there is insufficient free space; at least %1$s of free space is required. Please clear your internal storage before proceeding. Reboot diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java index bcf3f779..9db385a2 100644 --- a/src/org/lineageos/updater/UpdatesListAdapter.java +++ b/src/org/lineageos/updater/UpdatesListAdapter.java @@ -454,8 +454,8 @@ public class UpdatesListAdapter extends RecyclerView.Adapter= neededSpace; + if (!hasFreeSpace) { + String spaceMessage = resources.getString(R.string.dialog_free_space_low_message_pct, + Utils.getFileSize(neededSpace)); + return new AlertDialog.Builder(mActivity) + .setTitle(R.string.dialog_free_space_low_title) + .setMessage(spaceMessage) + .setPositiveButton(android.R.string.ok, null); + } + return new AlertDialog.Builder(mActivity) .setTitle(title) .setMessage(message) diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index 1574bc32..8f6e55ce 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -28,6 +28,7 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; import android.os.Environment; +import android.os.StatFs; import android.os.SystemProperties; import android.os.storage.StorageManager; import android.util.Log; @@ -49,6 +50,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashSet; @@ -151,6 +153,20 @@ public class Utils { return new int[]{ major, minor }; } + public static long availableFreeSpace() { + StatFs stats = new StatFs(Environment.getDataDirectory().getAbsolutePath()); + return stats.getAvailableBlocksLong() * stats.getBlockSizeLong(); + } + + // https://stackoverflow.com/a/28527441 + public static String getFileSize(long size) { + if (size <= 0) + return "0"; + final String[] units = new String[] { "B", "KB", "MB", "GB", "TB" }; + int digitGroups = (int) (Math.log10(size) / Math.log10(1024)); + return new DecimalFormat("#,##0.#").format(size / Math.pow(1024, digitGroups)) + " " + units[digitGroups]; + } + public static boolean canInstall(UpdateBaseInfo update) { return (SystemProperties.getBoolean(Constants.PROP_UPDATER_ALLOW_DOWNGRADING, false) || update.getTimestamp() > SystemProperties.getLong(Constants.PROP_BUILD_DATE, 0)); -- GitLab From 094f7e5357e034dc359b2bec2068bb979ad4cc98 Mon Sep 17 00:00:00 2001 From: althafvly Date: Wed, 28 Dec 2022 12:09:35 +0530 Subject: [PATCH 2/2] Updater: Cleanup imports Change-Id: I50dcf211b46f95838a89bb56c47a7f8b08596f11 --- src/org/lineageos/updater/UpdatesActivity.java | 4 +--- src/org/lineageos/updater/UpdatesListAdapter.java | 1 - src/org/lineageos/updater/controller/UpdaterService.java | 1 - .../lineageos/updater/download/HttpURLConnectionClient.java | 5 ++--- src/org/lineageos/updater/misc/Utils.java | 4 +--- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java index 6ae81edf..47d0b72a 100644 --- a/src/org/lineageos/updater/UpdatesActivity.java +++ b/src/org/lineageos/updater/UpdatesActivity.java @@ -21,9 +21,9 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.res.Configuration; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.icu.text.DateFormat; import android.net.Uri; import android.os.Build; @@ -37,13 +37,11 @@ import android.view.View; import android.view.animation.Animation; import android.view.animation.LinearInterpolator; import android.view.animation.RotateAnimation; -import android.widget.Button; import android.widget.Spinner; import android.widget.Switch; import android.widget.TextView; import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java index 9db385a2..82304df6 100644 --- a/src/org/lineageos/updater/UpdatesListAdapter.java +++ b/src/org/lineageos/updater/UpdatesListAdapter.java @@ -50,7 +50,6 @@ import com.google.android.material.snackbar.Snackbar; import org.lineageos.updater.controller.UpdaterController; import org.lineageos.updater.controller.UpdaterService; -import org.lineageos.updater.misc.BuildInfoUtils; import org.lineageos.updater.misc.Constants; import org.lineageos.updater.misc.PermissionsUtils; import org.lineageos.updater.misc.StringGenerator; diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java index c2ee31f6..21da556f 100644 --- a/src/org/lineageos/updater/controller/UpdaterService.java +++ b/src/org/lineageos/updater/controller/UpdaterService.java @@ -37,7 +37,6 @@ import androidx.preference.PreferenceManager; import org.lineageos.updater.R; import org.lineageos.updater.UpdaterReceiver; import org.lineageos.updater.UpdatesActivity; -import org.lineageos.updater.misc.BuildInfoUtils; import org.lineageos.updater.misc.Constants; import org.lineageos.updater.misc.StringGenerator; import org.lineageos.updater.misc.Utils; diff --git a/src/org/lineageos/updater/download/HttpURLConnectionClient.java b/src/org/lineageos/updater/download/HttpURLConnectionClient.java index 573a2492..ecf62520 100644 --- a/src/org/lineageos/updater/download/HttpURLConnectionClient.java +++ b/src/org/lineageos/updater/download/HttpURLConnectionClient.java @@ -17,9 +17,10 @@ package org.lineageos.updater.download; import android.os.SystemClock; import android.os.SystemProperties; - import android.util.Log; +import org.lineageos.updater.misc.Constants; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -34,8 +35,6 @@ import java.util.PriorityQueue; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.lineageos.updater.misc.Constants; - public class HttpURLConnectionClient implements DownloadClient { private final static String TAG = "HttpURLConnectionClient"; diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java index 8f6e55ce..0ba3f461 100644 --- a/src/org/lineageos/updater/misc/Utils.java +++ b/src/org/lineageos/updater/misc/Utils.java @@ -53,13 +53,11 @@ import java.io.IOException; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Enumeration; -import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.Set; +import java.util.regex.Pattern; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import java.util.regex.Pattern; public class Utils { -- GitLab