diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml deleted file mode 100644 index 2a425cb3..00000000 --- a/.github/workflows/create-release.yml +++ /dev/null @@ -1,321 +0,0 @@ -name: Create Release Assets - -on: - push: - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: 17 - - - name: Cache gradle - uses: actions/cache@v4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Build AAB - run: ./gradlew clean bundleRelease --stacktrace - - - name: Sign play AAB - uses: r0adkll/sign-android-release@v1 - with: - releaseDirectory: app/build/outputs/bundle/playRelease - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "34.0.0" - - - name: Sign free AAB - uses: r0adkll/sign-android-release@v1 - with: - releaseDirectory: app/build/outputs/bundle/freeRelease - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "34.0.0" - - - name: Sign offline AAB - uses: r0adkll/sign-android-release@v1 - with: - releaseDirectory: app/build/outputs/bundle/offlineRelease - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "34.0.0" - - - name: Build APK - run: ./gradlew assembleRelease --stacktrace - - - name: Sign play APK - uses: r0adkll/sign-android-release@v1 - with: - releaseDirectory: app/build/outputs/apk/play/release - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "34.0.0" - - - name: Sign free APK - uses: r0adkll/sign-android-release@v1 - with: - releaseDirectory: app/build/outputs/apk/free/release - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "34.0.0" - - - name: Sign offline APK - uses: r0adkll/sign-android-release@v1 - with: - releaseDirectory: app/build/outputs/apk/offline/release - signingKeyBase64: ${{ secrets.SIGNING_KEY }} - alias: ${{ secrets.KEY_ALIAS }} - keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} - keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - # override default build-tools version (29.0.3) -- optional - BUILD_TOOLS_VERSION: "34.0.0" - - - uses: kaisugi/action-regex-match@v1.0.1 - id: regex-match - with: - text: ${{ github.ref }} - regex: '(v*-pre*)' - flags: gm - - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: ${{ steps.regex-match.outputs.match != '' }} - - - name: Upload Play APK Universal Asset - id: upload-play-release-asset-universal-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-universal-release-unsigned-signed.apk - asset_name: amber-play-universal-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Free APK Universal Asset - id: upload-free-release-asset-universal-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/free/release/app-free-universal-release-unsigned-signed.apk - asset_name: amber-free-universal-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Offline APK Universal Asset - id: upload-offline-release-asset-universal-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/offline/release/app-offline-universal-release-unsigned-signed.apk - asset_name: amber-offline-universal-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Play APK x86 Asset - id: upload-play-release-asset-x86-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-x86-release-unsigned-signed.apk - asset_name: amber-play-x86-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Free APK x86 Asset - id: upload-free-release-asset-x86-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/free/release/app-free-x86-release-unsigned-signed.apk - asset_name: amber-free-x86-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Offline APK x86 Asset - id: upload-offline-release-asset-x86-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/offline/release/app-offline-x86-release-unsigned-signed.apk - asset_name: amber-offline-x86-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Play APK x86_64 Asset - id: upload-play-release-asset-x86-64-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-x86_64-release-unsigned-signed.apk - asset_name: amber-play-x86_64-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Free APK x86_64 Asset - id: upload-free-release-asset-x86-64-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/free/release/app-free-x86_64-release-unsigned-signed.apk - asset_name: amber-free-x86_64-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Play APK x86_64 Asset - id: upload-offline-release-asset-x86-64-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/offline/release/app-offline-x86_64-release-unsigned-signed.apk - asset_name: amber-offline-x86_64-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Play APK arm64-v8a Asset - id: upload-play-release-asset-arm64-v8a-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-arm64-v8a-release-unsigned-signed.apk - asset_name: amber-play-arm64-v8a-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Free APK arm64-v8a Asset - id: upload-free-release-asset-arm64-v8a-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/free/release/app-free-arm64-v8a-release-unsigned-signed.apk - asset_name: amber-free-arm64-v8a-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Offline APK arm64-v8a Asset - id: upload-offline-release-asset-arm64-v8a-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/offline/release/app-offline-arm64-v8a-release-unsigned-signed.apk - asset_name: amber-offline-arm64-v8a-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Play APK armeabi-v7a Asset - id: upload-play-release-asset-armeabi-v7a-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/play/release/app-play-armeabi-v7a-release-unsigned-signed.apk - asset_name: amber-play-armeabi-v7a-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Free APK armeabi-v7a Asset - id: upload-free-release-asset-armeabi-v7a-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/free/release/app-free-armeabi-v7a-release-unsigned-signed.apk - asset_name: amber-free-armeabi-v7a-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Offline APK armeabi-v7a Asset - id: upload-offline-release-asset-armeabi-v7a-apk - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/apk/offline/release/app-offline-armeabi-v7a-release-unsigned-signed.apk - asset_name: amber-offline-armeabi-v7a-${{ github.ref_name }}.apk - asset_content_type: application/zip - - - name: Upload Play AAB Asset - id: upload-play-release-asset-aab - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/bundle/playRelease/app-play-release.aab - asset_name: amber-play-${{ github.ref_name }}.aab - asset_content_type: application/zip - - - name: Upload Free AAB Asset - id: upload-free-release-asset-aab - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/bundle/freeRelease/app-free-release.aab - asset_name: amber-free-${{ github.ref_name }}.aab - asset_content_type: application/zip - - - name: Upload Offline AAB Asset - id: upload-offline-release-asset-aab - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: app/build/outputs/bundle/offlineRelease/app-offline-release.aab - asset_name: amber-offline-${{ github.ref_name }}.aab - asset_content_type: application/zip diff --git a/.gitignore b/.gitignore index ac75a192..3920b2af 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,11 @@ .cxx .kotlin/ keystore.properties +free/ +offline/ +app/free/release/ +app/play/release/ +app/offline/release/ # Built application files *.apk diff --git a/app/build.gradle b/app/build.gradle index 3f3a728d..16dbd0ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "com.greenart7c3.nostrsigner" minSdk 26 targetSdk 34 - versionCode 91 - versionName "1.3.7" + versionCode 92 + versionName "2.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c27dc9dc..e1086688 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -361,4 +361,17 @@ Keep the relays connections open all the time. Using this option is faster and will result in a better experience Notification Settings Please configure your notification settings before continuing. + Relay + Paid relays are not supported + Relays that require auth are not supported + Failed to reach %1$s: %2$s + Failed to assemble NIP-11 url for %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse response from %1$s: %2$s + Relay declined request %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse result from %1$s: %2$s + %1$s failed with code %2$s + Download relay document unavailable + Failed to send event to relay diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a6a6b53c..cd52b5c0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -361,4 +361,17 @@ Keep the relays connections open all the time. Using this option is faster and will result in a better experience Notification Settings Please configure your notification settings before continuing. + Relay + Paid relays are not supported + Relays that require auth are not supported + Failed to reach %1$s: %2$s + Failed to assemble NIP-11 url for %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse response from %1$s: %2$s + Relay declined request %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse result from %1$s: %2$s + %1$s failed with code %2$s + Download relay document unavailable + Failed to send event to relay diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 39ca3bae..437c7609 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -361,4 +361,17 @@ Keep the relays connections open all the time. Using this option is faster and will result in a better experience Notification Settings Please configure your notification settings before continuing. + Relay + Paid relays are not supported + Relays that require auth are not supported + Failed to reach %1$s: %2$s + Failed to assemble NIP-11 url for %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse response from %1$s: %2$s + Relay declined request %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse result from %1$s: %2$s + %1$s failed with code %2$s + Download relay document unavailable + Failed to send event to relay diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 8c422cc0..de00db0d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -359,4 +359,17 @@ Keep the relays connections open all the time. Using this option is faster and will result in a better experience Notification Settings Please configure your notification settings before continuing. + Relay + Paid relays are not supported + Relays that require auth are not supported + Failed to reach %1$s: %2$s + Failed to assemble NIP-11 url for %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse response from %1$s: %2$s + Relay declined request %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse result from %1$s: %2$s + %1$s failed with code %2$s + Download relay document unavailable + Failed to send event to relay diff --git a/app/src/main/res/values-sw-rKE/strings.xml b/app/src/main/res/values-sw-rKE/strings.xml index f2959dc1..433fde88 100644 --- a/app/src/main/res/values-sw-rKE/strings.xml +++ b/app/src/main/res/values-sw-rKE/strings.xml @@ -358,4 +358,17 @@ Keep the relays connections open all the time. Using this option is faster and will result in a better experience Notification Settings Please configure your notification settings before continuing. + Relay + Paid relays are not supported + Relays that require auth are not supported + Failed to reach %1$s: %2$s + Failed to assemble NIP-11 url for %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse response from %1$s: %2$s + Relay declined request %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse result from %1$s: %2$s + %1$s failed with code %2$s + Download relay document unavailable + Failed to send event to relay diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 6ad83fae..780c2798 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -361,4 +361,17 @@ Keep the relays connections open all the time. Using this option is faster and will result in a better experience Notification Settings Please configure your notification settings before continuing. + Relay + Paid relays are not supported + Relays that require auth are not supported + Failed to reach %1$s: %2$s + Failed to assemble NIP-11 url for %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse response from %1$s: %2$s + Relay declined request %1$s: %2$s + Failed to reach %1$s: %2$s + Failed to parse result from %1$s: %2$s + %1$s failed with code %2$s + Download relay document unavailable + Failed to send event to relay