Build 29084606

Readme.md

@@ -27,6 +27,11 @@ Other translation are very welcome, contact me if you'd like to submit one.
 
 ## Done
 
+
+## 29084571
+
+- simpler and more readable encoding for save files
+- removed check of payload signature on save file, seemed to fail because of the poor encoding of the name of the "côte d'ivoire" level
 - automatic detection of the number of steps required for physics
 - trial runs detection fix
 

app/build.gradle.kts

@@ -29,8 +29,8 @@ android {
         applicationId = "me.lecaro.breakout"
         minSdk = 21
         targetSdk = 34
-        versionCode = 29084571
+        versionCode = 29084606
-        versionName = "29084571"
+        versionName = "29084606"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true

src/PWA/sw-b71.js

@@ -1,5 +1,5 @@
 // The version of the cache.
-const VERSION = "29084571";
+const VERSION = "29084606";
 
 // The name of the cache
 const CACHE_NAME = `breakout-71-${VERSION}`;

src/data/version.json

@@ -1 +1 @@
-"29084571"
+"29084606"

src/game.ts

@@ -708,24 +708,16 @@ async function openSettingsMenu() {
     text: t("settings.download_save_file"),
     help: t("settings.download_save_file_help"),
     async value() {
-      const signedPayload = generateSaveFileContent();
-
       const dlLink = document.createElement("a");
-
+      const obj = {
-      dlLink.setAttribute(
-        "href",
-        "data:application/json;base64," +
-          btoa(
-            JSON.stringify({
         fileType: "B71-save-file",
         appVersion,
-              signedPayload,
+        payload: generateSaveFileContent(),
-              key: hashCode(
+      };
-                "Security by obscurity, but really the game is oss so eh" +
+      const json = JSON.stringify(obj, null, 2);
-                  signedPayload,
+      dlLink.setAttribute(
-              ),
+        "href",
-            }),
+        "data:application/json;charset=utf-8," + encodeURIComponent(json),
-          ),
       );
 
       dlLink.setAttribute(
@@ -735,7 +727,7 @@ async function openSettingsMenu() {
             .toISOString()
             .slice(0, 19)
             .replace(/[^0-9]+/gi, "-") +
-          ".b71",
+          ".json",
       );
       document.body.appendChild(dlLink);
       dlLink.click();
@@ -772,37 +764,22 @@ async function openSettingsMenu() {
 
                 reader.readAsText(file);
               });
-              const {
+              const { fileType, signedPayload, payload } = JSON.parse(content);
-                fileType,
-                appVersion: fileVersion,
-                signedPayload,
-                key,
-              } = JSON.parse(content);
               if (fileType !== "B71-save-file")
                 throw new Error("Not a B71 save file");
-              // Actually, loading a save file to an older version is pretty useful
+              if (payload) {
-              // if (fileVersion > appVersion)
+                localStorage.clear();
-              //   throw new Error(
+                for (let key in payload) {
-              //     "Please update your app first, this file is for version " +
+                  localStorage.setItem(key, JSON.stringify(payload[key]));
-              //       fileVersion +
-              //       " or newer.",
-              //   );
-
-              if (
-                key !==
-                hashCode(
-                  "Security by obscurity, but really the game is oss so eh" +
-                    signedPayload,
-                )
-              ) {
-                throw new Error("Key does not match content.");
                 }
-
+              } else if (signedPayload) {
+                //   Old file format
                 const localStorageContent = JSON.parse(signedPayload);
                 localStorage.clear();
                 for (let key in localStorageContent) {
                   localStorage.setItem(key, localStorageContent[key]);
                 }
+              }
               await asyncAlert({
                 title: t("settings.save_file_loaded"),
                 content: [

src/generateSaveFileContent.ts

@@ -5,8 +5,10 @@ export function generateSaveFileContent() {
     const key = localStorage.key(i) as string;
     // Avoid including recovery info in the recovery info
     if (["recovery_data"].includes(key)) continue;
+    try {
       const value = localStorage.getItem(key) as string;
-    localStorageContent[key] = value;
+      localStorageContent[key] = JSON.parse(value);
+    } catch (e) {}
   }
-  return JSON.stringify(localStorageContent);
+  return localStorageContent;
 }

src/migrations.ts

@@ -80,18 +80,30 @@ migrate("remove_long_and_creative_mode_data", () => {
     localStorage.setItem("breakout_71_runs_history", JSON.stringify(cleaned));
 });
 
-migrate("compact_runs_data", () => {
+migrate("compact_runs_data_again", () => {
   let runsHistory = JSON.parse(
     localStorage.getItem("breakout_71_runs_history") || "[]",
   ) as RunHistoryItem[];
+  runsHistory = runsHistory.filter((r) => {
+    if (!r.perks) return false;
+    if ("mode" in r) {
+      if (r.mode !== "short") {
+        return false;
+      }
+      delete r.mode;
+    }
 
+    return true;
+  });
   runsHistory.forEach((r) => {
     r.runTime = Math.round(r.runTime);
+    if (r.perks) {
       for (let key in r.perks) {
-      if (r.perks && !r.perks[key]) {
+        if (!r.perks[key]) {
           delete r.perks[key];
         }
       }
+    }
     if ("best_level_score" in r) {
       delete r.best_level_score;
     }