Skip to content

Commit 9c79ef9

Browse files
committed
Browser build alias back to key0
1 parent 736c7d9 commit 9c79ef9

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

‎aaps-builder/README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,16 @@ notices kept in the files):
112112
into GitHub's new-file page instead of asking the user to copy and paste it
113113
(**Copy workflow** stays for updates). The build steps also reject unknown
114114
variants.
115+
6. New keys created on the setup page use the alias `key0` (upstream: `aaps`),
116+
the same as the preparation page of the older browser build and Android
117+
Studio's default. Keys created before this change keep the alias `aaps`; the
118+
alias travels inside `KEYSTORE_SET`, so builds work with either.
115119

116120
## Checksums (of the committed files, LF line endings)
117121

118122
```
119-
SHA-256(aaps-builder.html) = fdf26d687b4d980f04b3e27cf9eca20a159a7434eba7906cc1fb70a4a694db11
120-
SHA-256(aaps-builder.app.js) = 3f50a913902ebb3999b55a3aad7ef1432d5562e066f3b09cced7644c0cb41d76
123+
SHA-256(aaps-builder.html) = bec07ba20314a60342086332a5da00c82028039cbdc99f8ae2542109e87a8c8c
124+
SHA-256(aaps-builder.app.js) = 7979eefa196b6549fb99296b211b761c1ff01e21aed3fb6a2200ed8399c02d93
121125
SHA-256(aaps-builder-build.yml) = f294d2c515f846abf4cb786545d4628051e5d245465af0edea0d1631d7614a9a
122126
SHA-256(aaps-builder.forge.min.js) = dc67fd132427ad96c9666c844b39565413c40ddb1f2d063c53512fbf6d387dfd
123127
SHA-256(.github/workflows/aaps-builder.yml) = 84f52b9a7e4db9447f56a6e7bec058b82bd1a26fcea9cd15d76d118015a30115

‎docs/EN/SettingUpAaps/BrowserBuildAapsBuilder.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ A private repository gets 2000 free GitHub Actions minutes per month, which is e
5353
- **You already have AAPS on your phone, built with a keystore you still have**: choose **I already have a keystore** on the setup page and upload it. Your next build will update AAPS in place.
5454
- **You build AAPS for the first time, or you lost your keystore or its password**: choose **Create a new key**. An app signed with a new key **cannot update** an AAPS signed with another key. You must export your settings, copy the file off your phone, uninstall the old AAPS, install the new one, then import your settings: see [Reinstalling AAPS with a new keystore](#reinstall-aaps).
5555
56-
Always keep using the same key afterwards. When you create a new key, download the backup the page offers and store it with its password and its alias (`aaps`) somewhere safe, off your phone.
56+
Always keep using the same key afterwards. When you create a new key, download the backup the page offers and store it with its password and its alias (`key0`) somewhere safe, off your phone.
5757
```
5858

5959
## Open the setup page
@@ -165,9 +165,9 @@ The page checks the password and the alias on your device. **Keystore OK! Contin
165165

166166
- the file `aaps-keystore.jks`,
167167
- your password,
168-
- the alias of the key: **`aaps`**.
168+
- the alias of the key: **`key0`**.
169169

170-
You need all three if you ever build AAPS another way, for example with Android Studio.
170+
You need all three if you ever build AAPS another way, for example with Android Studio. Keys created with an earlier version of the setup page have the alias `aaps`.
171171

172172
![Key created and the backup box](../images/Building-the-App/CI/AapsBuilder42_KeyCreated.png)
173173

‎docs/EN/_html/aaps-builder.app.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,9 @@
271271
const subject = [{ name: 'commonName', value: 'AAPS' }];
272272
cert.setSubject(subject); cert.setIssuer(subject);
273273
cert.sign(key, forge.md.sha256.create());
274-
const asn = forge.pkcs12.toPkcs12Asn1(key, [cert], p1, { algorithm: '3des', friendlyName: 'aaps', generateLocalKeyId: true });
274+
const asn = forge.pkcs12.toPkcs12Asn1(key, [cert], p1, { algorithm: '3des', friendlyName: 'key0', generateLocalKeyId: true });
275275
newKsBytes = binStrToBytes(forge.asn1.toDer(asn).getBytes());
276-
setSecret(newKsBytes, p1, 'aaps', p1);
276+
setSecret(newKsBytes, p1, 'key0', p1);
277277
$('backupBox').hidden = false;
278278
msg('newMsg', M.okNew, 'ok');
279279
} catch (e) {

‎docs/EN/_html/aaps-builder.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ <h2><span class="num">3</span><span>Your signing key</span></h2>
191191
<ul class="small">
192192
<li>the file <code>aaps-keystore.jks</code></li>
193193
<li>your password</li>
194-
<li>the alias of the key: <b><code>aaps</code></b></li>
194+
<li>the alias of the key: <b><code>key0</code></b></li>
195195
</ul>
196196
<p>You will need all three if you ever build AAPS another way, e.g. with Android Studio.</p>
197197
<button class="btn" id="downloadKs">Download backup (aaps-keystore.jks)</button>
987 Bytes
Loading

0 commit comments

Comments
 (0)