diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 06b7c4e..eaf90d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '21' @@ -34,13 +34,13 @@ jobs: run: ./gradlew build - name: Upload Debug APK (testkey) - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: OwnDroid-CI-${{ env.SHORT_SHA }}-debug-testkey path: app/build/outputs/apk/debug/app-debug.apk - name: Upload Release APK (testkey) - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: OwnDroid-CI-${{ env.SHORT_SHA }}-release-testkey path: app/build/outputs/apk/release/app-release.apk @@ -51,13 +51,13 @@ jobs: ./gradlew build -PStoreFile="$(pwd)/app/release.jks" -PStorePassword="${{ secrets.KEYSTORE_PASSWORD }}" -PKeyPassword="${{ secrets.KEY_PASSWORD }}" -PKeyAlias="${{ secrets.KEY_ALIAS }}" - name: Upload Debug APK - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: OwnDroid-CI-${{ env.SHORT_SHA }}-debug-signed path: app/build/outputs/apk/debug/app-debug.apk - name: Upload Release APK - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: OwnDroid-CI-${{ env.SHORT_SHA }}-release-signed path: app/build/outputs/apk/release/app-release.apk @@ -68,7 +68,7 @@ jobs: needs: build steps: - name: Download Artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v7 with: path: artifacts diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml new file mode 100644 index 0000000..c3ae2f0 --- /dev/null +++ b/.github/workflows/dependency-submission.yml @@ -0,0 +1,22 @@ +name: Dependency submission + +on: + push: + branches: [ "master" ] + +jobs: + dependency-submission: + name: Dependency submission + runs-on: ubuntu-latest + steps: + - name: Check out repository + uses: actions/checkout@v6 + + - name: Set up JDK 21 + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: '21' + + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e2288c..3218d34 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,12 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repository - uses: actions/checkout@v4 - with: - ref: 'master' + uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '21' @@ -33,7 +31,4 @@ jobs: - name: Create release run: git tag -l ${{ github.ref_name }} --format="%(contents:body)" | gh release create ${{ github.ref_name }} -t ${{ github.ref_name }} *.apk -d -F - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Generate and submit dependency graph - uses: gradle/actions/dependency-submission@v4 \ No newline at end of file + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Readme-ja.md b/Readme-ja.md index 4a8c3d5..eb017c8 100644 --- a/Readme-ja.md +++ b/Readme-ja.md @@ -1,7 +1,8 @@ [English](Readme.md) | [简体中文](Readme-zh_CN.md) > [!important] -> The Japanese readme need update +> The Japanese readme is outdated +> 日语的Readme已经过时 # OwnDroid diff --git a/Readme-zh_CN.md b/Readme-zh_CN.md index 3e67369..1bd036f 100644 --- a/Readme-zh_CN.md +++ b/Readme-zh_CN.md @@ -99,7 +99,9 @@ pm set-user-restriction no_add_clone_profile 0 一些系统在设置了device owner后不允许在安卓设置中创建用户，你可以在OwnDroid中创建用户。 如果你有root，你也可以在adb shell中运行以上命令以解除限制。 -## API +## 高级用户 + +### API OwnDroid提供了一个基于Intent的API。你需要在设置中设置密钥并启用API。括号中的数字是最小的安卓版本。 @@ -137,7 +139,9 @@ context.sendBroadcast(intent) [可用的用户限制](https://developer.android.google.cn/reference/android/os/UserManager#constants_1) -## 构建 +## 开发者 + +### 构建 你可以在命令行中使用Gradle以构建OwnDroid ```shell @@ -148,6 +152,10 @@ context.sendBroadcast(intent) ``` （在Windows系统中应使用`./gradlew.bat`) +### 贡献 + +请使用`dev`分支。 + ## 许可证 [License.md](LICENSE.md) diff --git a/Readme.md b/Readme.md index 122a374..961e254 100644 --- a/Readme.md +++ b/Readme.md @@ -101,7 +101,9 @@ pm set-user-restriction no_add_clone_profile 0 Some systems disable the feature of adding users in Android settings once a device owner is set. You have to create users in OwnDroid. Or if you have root, run the above command in adb shell to remove that restriction. -## API +## For advanced users + +### API OwnDroid provides an Intent-based API. You need to set the API key in settings and enable the API. The numbers in brackets represent the minimum Android version required. @@ -139,7 +141,9 @@ context.sendBroadcast(intent) [Available user restrictions](https://developer.android.com/reference/android/os/UserManager#constants_1) -## Build +## For developers + +### Build You can use Gradle in command line to build OwnDroid. ```shell @@ -150,6 +154,10 @@ You can use Gradle in command line to build OwnDroid. ``` (Use `./gradlew.bat` instead on Windows) +### Contribute + +Please use the `dev` branch. + ## License [License.md](LICENSE.md) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7c1761d..354a9f6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -25,8 +25,8 @@ android { applicationId = "com.bintianqi.owndroid" minSdk = 23 targetSdk = 36 - versionCode = 42 - versionName = "7.3" + versionCode = 43 + versionName = "8.0" multiDexEnabled = false } diff --git a/app/src/main/java/com/bintianqi/owndroid/feature/privilege/WorkingModesScreen.kt b/app/src/main/java/com/bintianqi/owndroid/feature/privilege/WorkingModesScreen.kt index 7dfad67..aa23155 100644 --- a/app/src/main/java/com/bintianqi/owndroid/feature/privilege/WorkingModesScreen.kt +++ b/app/src/main/java/com/bintianqi/owndroid/feature/privilege/WorkingModesScreen.kt @@ -93,7 +93,7 @@ fun WorkModesScreen( Column { Text(stringResource(R.string.app_name)) Text( - stringResource(R.string.choose_work_mode), Modifier.alpha(0.8F), + stringResource(R.string.choose_working_mode), Modifier.alpha(0.8F), style = typography.bodyLarge ) } diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 60995ac..8da6671 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -685,7 +685,7 @@ Son güçlü kimlik doğrulama yönteminin (parola, PIN veya desen) kullanıldığından beri kullanıcının ikincil, güçlü olmayan kimlik doğrulamayı ne kadar süre kullanabileceğini belirler. Dönen zaman aşımından sonra kullanıcı güçlü kimlik doğrulama yöntemi kullanmak zorundadır.\n0 değeri, yöneticinin zaman aşımı kontrolüne katılmadığı anlamına gelir. Minimum ve maksimum zaman aşımı süreleri platform tarafından tanımlanır ve genellikle sırasıyla 1 saat ve 72 saattir. OwnDroid yetkilerini kaybedecektir. - Çalışma Modunu Seç + Çalışma Modunu Seç Önerilen Etkinleştirme Yöntemi ADB Komutu diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index da04e48..72f2e54 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -715,7 +715,7 @@ OwnDroid将会丢失特权 你的个人应用被OwnDroid挂起 - 选择一个工作模式 + 选择一个工作模式 推荐 激活方法 ADB命令 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4391081..43da711 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -752,7 +752,7 @@ OwnDroid will lost its privilege Your personal apps is suspended by OwnDroid - Choose a work mode + Choose a working mode Recommended Activate method ADB command