Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
sajalbnl committed Dec 12, 2024
2 parents 66a0fcf + cc94765 commit 1ec8f02
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 8 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@
"contributions": [
"code"
]
},
{
"login": "omahs",
"name": "omahs",
"avatar_url": "https://avatars.githubusercontent.com/u/73983677?v=4",
"profile": "https://github.com/omahs",
"contributions": [
"doc"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- markdownlint-disable MD051 -->
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->
<!-- markdownlint-enable MD051 -->

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ We live on contributions. If you'd like to contribute please follow the [guide](
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Gift-Naomi"><img src="https://avatars.githubusercontent.com/u/149405096?v=4?s=100" width="100px;" alt="Mystic"/><br /><sub><b>Mystic</b></sub></a><br /><a href="#design-Gift-Naomi" title="Design">🎨</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mubarak23"><img src="https://avatars.githubusercontent.com/u/7858376?v=4?s=100" width="100px;" alt="Mubarak Muhammad Aminu"/><br /><sub><b>Mubarak Muhammad Aminu</b></sub></a><br /><a href="https://github.com/keep-starknet-strange/starknet-phone/commits?author=mubarak23" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://kishanpatel.tech/"><img src="https://avatars.githubusercontent.com/u/55874508?v=4?s=100" width="100px;" alt="Kishan Patel"/><br /><sub><b>Kishan Patel</b></sub></a><br /><a href="https://github.com/keep-starknet-strange/starknet-phone/commits?author=maxslimb" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/omahs"><img src="https://avatars.githubusercontent.com/u/73983677?v=4?s=100" width="100px;" alt="omahs"/><br /><sub><b>omahs</b></sub></a><br /><a href="https://github.com/keep-starknet-strange/starknet-phone/commits?author=omahs" title="Documentation">📖</a></td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 2 additions & 2 deletions docs/src/getting-started/android-development.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

# Android Development Crash Course

Because GrapheneOS (and thus Starknet Phone) is based on android, it is compatiable
with Android native applications. This will be a broad overview on how Android
Because GrapheneOS (and thus Starknet Phone) is based on android, it is compatible
with Android native applications. This will be a broad overview of how Android
development is approached in this project.

## Environment/Android Studio setup
Expand Down
2 changes: 1 addition & 1 deletion docs/src/getting-started/building-the-os.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ echo 'export PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin' >> ~/.bashrc
source ~/.bashrc
```

More detailed dependiencies and build guide can be found
More detailed dependencies and build guide can be found
[here](https://grapheneos.org/build)

## Downloading the source code
Expand Down
2 changes: 1 addition & 1 deletion docs/src/getting-started/rust-android-module.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ for the build command

[Documentaiont](https://developer.android.com/develop/background-work/services)

Main idea: servies are long-running operations in the background that can be accessed mby multiple devices.
Main idea: services are long-running operations in the background that can be accessed by multiple devices.
This is what we want for the light client, and is how Ethereum Phone implements their light client.

Must be declared in the manifest file:
Expand Down
2 changes: 1 addition & 1 deletion docs/src/getting-started/rust-in-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class RustLib {

## Writing the rust side

We will writing rust code that compiles as C code to match the C header generated
We will write rust code that compiles as C code to match the C header generated
when compiling the Java library created in the previous step.
Use javac to compile the Java class into a C header.

Expand Down
4 changes: 2 additions & 2 deletions docs/src/overview/hardware-signing.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ extracted from the device via the secure keystore system.
[Android Keystore Documentation](https://developer.android.com/privacy-and-security/keystore)

Some notable features:
- Extraction prevention: key material cannot be extracted from the deivce in case of theft and
- Extraction prevention: key material cannot be extracted from the device in case of theft and
cannot be accessed by application processes.
- Hardware security module: similar to a Trusted Execution Environment (TEE), but specifically
embedded Secure Elements (eSE) or on-SoC secure processing units (iSE)
- Key use authorizations: specific authorizations can be set (and cannot be changed) to enforce
key usage to meet certain constraints such as specific algortithms or time intervals.
key usage to meet certain constraints such as specific algorithms or time intervals.


## The Starknet side
Expand Down

0 comments on commit 1ec8f02

Please sign in to comment.