nils/mg4
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 28 Wiki Activity

App 2.19.3: update log on the Logs tab

Browse Source 
Every update and install step, with the platform's own result, kept
across the restart an install causes, so a failed install on the car
can be read off the screen.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LhzAVaUyqcw5PkGjz4mWW6
This commit is contained in:
nils
2026-10-23 21:15:44 +02:00
co-authored by Claude Opus 5.5
parent 50217aef74
commit 51beea5ed8
11 changed files with 147 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/evsuite/abrp/AbrpUploadService.java
+1
View File
@@ -81,6 +81,7 @@ public class AbrpUploadService extends Service {
super.onCreate();
prefs = getSharedPreferences("abrp_prefs", MODE_PRIVATE);
uploadLog.clear();
UpdateLog.noteVersion(this, BuildConfig.VERSION_NAME);
scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
Thread t = new Thread(r, "abrp-upload");
t.setDaemon(false);
app/src/main/java/com/evsuite/abrp/MainActivity.java
+11 -2
View File
@@ -285,6 +285,7 @@ public class MainActivity extends AppCompatActivity {
panes = new View[] { vehiclePane, consumptionPane, chargingPane, servicePane, serverPane,
settingsPane, logPane };
UpdateLog.noteVersion(this, BuildConfig.VERSION_NAME);
bindVehiclePane();
bindConsumptionPane();
bindChargingPane();
@@ -1792,13 +1793,21 @@ public class MainActivity extends AppCompatActivity {
private void refreshCallLog() {
java.util.List<UploadLog.Entry> entries = AbrpUploadService.log().recent();
// Update steps first: after a failed install, they are what the driver came here for.
java.util.List<String> updates = UpdateLog.lines(this);
StringBuilder sb = new StringBuilder();
if (!updates.isEmpty()) {
sb.append(getString(R.string.update_log_title));
for (String line : updates) sb.append('\n').append(line);
sb.append('\n');
}
if (entries.isEmpty()) {
callLogText.setText(R.string.call_log_empty);
if (sb.length() == 0) callLogText.setText(R.string.call_log_empty);
else callLogText.setText(sb.append('\n').append(getString(R.string.call_log_empty)).toString());
return;
}
java.text.SimpleDateFormat format =
new java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.US);
StringBuilder sb = new StringBuilder();
for (UploadLog.Entry entry : entries) {
if (sb.length() > 0) sb.append('\n');
sb.append(entry.success ? "OK " : "ERR ")
app/src/main/java/com/evsuite/abrp/UpdateLog.java
+78
View File
@@ -0,0 +1,78 @@
package com.evsuite.abrp;
import android.content.Context;
import android.content.SharedPreferences;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Locale;
/**
* The last {@link #MAX_LINES} steps of updating the app — checks, USB installs, and the
* platform's own words about an install — shown on the Logs tab.
*
* Kept apart from {@link UploadLog}, whose failures decide the service's health, and stored in
* preferences rather than memory: a successful install restarts the process, and the car has
* no adb, so this is the only place the driver can read why an install failed. It never holds
* a URL or a credential, only what happened.
*/
final class UpdateLog {
static final int MAX_LINES = 10;
private static final String PREFS = "update_log";
private static final String KEY = "lines";
private static final String KEY_VERSION = "version";
private UpdateLog() {}
static void record(Context context, String what) {
if (context == null || what == null) return;
String line = new SimpleDateFormat("dd.MM. HH:mm:ss", Locale.US).format(new Date()) + " " + what;
synchronized (UpdateLog.class) {
SharedPreferences prefs = context.getApplicationContext()
.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
List<String> lines = append(split(prefs.getString(KEY, null)), line, MAX_LINES);
prefs.edit().putString(KEY, String.join("\n", lines)).commit();
}
}
/**
* Records the version the app now runs, once per version: after an install, the line that
* says it worked, since the installing process does not live to say so.
*/
static void noteVersion(Context context, String version) {
if (context == null || version == null) return;
SharedPreferences prefs = context.getApplicationContext()
.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
String last = prefs.getString(KEY_VERSION, null);
if (version.equals(last)) return;
prefs.edit().putString(KEY_VERSION, version).commit();
if (last != null) record(context, "Now running " + version + " (was " + last + ")");
}
/** Newest first. */
static List<String> lines(Context context) {
SharedPreferences prefs = context.getApplicationContext()
.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
return split(prefs.getString(KEY, null));
}
/** {@code line} in front, newlines flattened, at most {@code max} lines kept. */
static List<String> append(List<String> newestFirst, String line, int max) {
List<String> out = new ArrayList<>();
out.add(line.replace('\n', ' ').replace('\r', ' '));
for (String l : newestFirst) {
if (out.size() >= max) break;
out.add(l);
}
return out;
}
private static List<String> split(String stored) {
if (stored == null || stored.isEmpty()) return new ArrayList<>();
return new ArrayList<>(Arrays.asList(stored.split("\n")));
}
}
app/src/main/res/values/strings.xml
+1
View File
@@ -171,6 +171,7 @@
<!-- Call log -->
<string name="label_call_log">Recent uploads</string>
<string name="call_log_empty">No upload attempted yet.</string>
<string name="update_log_title">Updates, newest first:</string>
<string name="btn_flush_now">Upload now</string>
<string name="foreground_title">Foreground apps</string>
<string name="foreground_hint">For the CarPlay full-screen test: open CarPlay, come back here, read its name off the list. Reads only.</string>
app/src/test/java/com/evsuite/abrp/UpdateLogTest.java
+25
View File
@@ -0,0 +1,25 @@
package com.evsuite.abrp;
import static org.junit.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Test;
/** The update log's line handling — pure JVM. */
public class UpdateLogTest {
@Test
public void newestComesFirstAndTheOldestFallsOff() {
List<String> lines = UpdateLog.append(Arrays.asList("b", "a"), "c", 2);
assertEquals(Arrays.asList("c", "b"), lines);
}
@Test
public void aMultiLinePlatformMessageStaysOneLine() {
List<String> lines = UpdateLog.append(Collections.emptyList(), "failed:\nINSTALL_X\r", 10);
assertEquals(Collections.singletonList("failed: INSTALL_X "), lines);
}
}
app/src/unstable/java/com/evsuite/abrp/OtaInstallResultReceiver.java
+2
View File
@@ -29,6 +29,8 @@ public final class OtaInstallResultReceiver extends BroadcastReceiver {
int status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE);
String message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE);
Log.i(TAG, "OTA install result: status=" + status + " msg=" + message);
UpdateLog.record(context, "Install result: status " + status
+ (message != null ? ", " + message : ""));
switch (status) {
case PackageInstaller.STATUS_PENDING_USER_ACTION:
app/src/unstable/java/com/evsuite/abrp/OtaUpdater.java
+7
View File
@@ -468,11 +468,14 @@ final class OtaUpdater {
return InstallResult.SESSION_STARTED;
} catch (Throwable t) {
Log.w(TAG, "OTA session install failed; trying system install UI", t);
UpdateLog.record(context, "Installer session failed: " + t);
try {
launchInstallerActivity(context, apk);
UpdateLog.record(context, "Opened the system installer instead");
return InstallResult.INSTALL_UI_STARTED;
} catch (Throwable fallback) {
Log.w(TAG, "OTA install UI failed", fallback);
UpdateLog.record(context, "System installer failed too: " + fallback);
return InstallResult.SESSION_FAILED;
}
}
@@ -490,6 +493,8 @@ final class OtaUpdater {
.getPackageArchiveInfo(apk.getAbsolutePath(), 0);
if (info == null || info.packageName == null) {
Log.w(TAG, "OTA archive cannot be parsed by the package manager");
UpdateLog.record(context, "Package manager cannot parse " + apk.getName()
+ " (" + apk.length() + " bytes)");
return false;
}
if (!context.getPackageName().equals(info.packageName)) {
@@ -533,6 +538,8 @@ final class OtaUpdater {
// confirm, EXTRA_INTENT. An immutable PendingIntent would arrive empty.
PendingIntent pending = PendingIntent.getBroadcast(context, sessionId, callback,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
// Written before commit: a successful install replaces this process at once.
UpdateLog.record(context, "Handed " + apk.length() + " bytes to the installer");
session.commit(pending.getIntentSender());
committed = true;
Log.i(TAG, "OTA session " + sessionId + " committed (" + apk.length() + " bytes)");
app/src/unstable/java/com/evsuite/abrp/UpdateHook.java
+7 -2
View File
@@ -83,10 +83,12 @@ final class UpdateHook {
message = runCheck(app, listener, main);
} catch (Throwable t) {
Log.w(TAG, "Update check threw", t);
message = "Update check failed";
// The class only: a network error's text can carry the server's address.
message = "Update check failed (" + t.getClass().getSimpleName() + ")";
} finally {
checking.set(false);
}
UpdateLog.record(app, "Check: " + message);
if (listener != null) {
final String result = message;
main.post(() -> listener.onResult(result));
@@ -112,10 +114,11 @@ final class UpdateHook {
message = runUsbInstall(app);
} catch (Throwable t) {
Log.w(TAG, "USB install threw", t);
message = "Installing from USB failed";
message = "Installing from USB failed: " + t;
} finally {
checking.set(false);
}
UpdateLog.record(app, "USB: " + message);
if (listener != null) {
final String result = message;
main.post(() -> listener.onResult(result));
@@ -141,6 +144,7 @@ final class UpdateHook {
if (best == null) {
return "No newer NilsMG4-unstable-<version>.apk on a USB stick (installed: " + current + ")";
}
UpdateLog.record(app, "USB: found " + best + " (" + best.length() + " bytes)");
File sidecar = new File(best.getPath() + ".sha256");
String expected = sidecar.isFile() && sidecar.length() < 16 * 1024
? OtaUpdater.parseExpectedSha256(new String(java.nio.file.Files.readAllBytes(sidecar.toPath()),
@@ -156,6 +160,7 @@ final class UpdateHook {
StringBuilder hex = new StringBuilder();
for (byte b : digest.digest()) hex.append(String.format(java.util.Locale.US, "%02x", b));
if (!hex.toString().equalsIgnoreCase(expected)) return "Not installed: " + best.getName() + " does not match its SHA-256";
UpdateLog.record(app, "USB: SHA-256 matches");
String version = OtaUpdater.versionFromAssetName(best.getName());
switch (OtaUpdater.install(app, best)) {
case SESSION_STARTED: