v5.4.4

.github/workflows/cd.yml

@@ -27,11 +27,14 @@ jobs:
           distribution: 'temurin'
           java-version: 20.0.2+9
 
+      - name: Accept Android SDK licenses
+        run: yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
+
       - name: Decode signing certificate into a file
         env:
-         CERTIFICATE_BASE64: ${{ secrets.ANDROID_DIST_SIGNING_KEY }}
+          CERTIFICATE_BASE64: ${{ secrets.ANDROID_DIST_SIGNING_KEY }}
         run: |
-         echo $CERTIFICATE_BASE64 | base64 --decode > google-release.keystore
+          echo $CERTIFICATE_BASE64 | base64 --decode > google-release.keystore
 
       - name: Build android beta
         run: bundle exec fastlane android beta

.gitignore

@@ -8,5 +8,5 @@ captures
 .cxx
 *.apk
 .kotlin
-build
+/build
 

Gemfile.lock

@@ -222,4 +222,4 @@ RUBY VERSION
    ruby 3.3.0p0
 
 BUNDLED WITH
-   2.5.4
+   2.5.4

apps/signer/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -9,10 +11,10 @@ android {
 
     defaultConfig {
         applicationId = Build.namespacePrefix("signer")
-        minSdk = Build.minSdkVersion
-        targetSdk = 34
-        versionCode = 22
-        versionName = "0.2.2"
+        minSdk = 26
+        targetSdk = Build.compileSdkVersion
+        versionCode = 23
+        versionName = "0.2.3"
     }
 
     lint {
@@ -43,51 +45,42 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
     packaging {
         resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     }
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.core)
-    implementation(Dependence.AndroidX.appCompat)
-    implementation(Dependence.AndroidX.activity)
-    implementation(Dependence.AndroidX.fragment)
-    implementation(Dependence.AndroidX.recyclerView)
-    implementation(Dependence.AndroidX.viewPager2)
-    implementation(Dependence.AndroidX.splashscreen)
+    implementation(libs.androidX.core)
+    implementation(libs.androidX.appCompat)
+    implementation(libs.androidX.activity)
+    implementation(libs.androidX.fragment)
+    implementation(libs.androidX.recyclerView)
+    implementation(libs.androidX.viewPager2)
+    implementation(libs.androidX.splashscreen)
 
-    implementation(Dependence.UI.material)
-    implementation(Dependence.UI.flexbox)
-    implementation(Dependence.AndroidX.Camera.base)
-    implementation(Dependence.AndroidX.Camera.core)
-    implementation(Dependence.AndroidX.Camera.lifecycle)
-    implementation(Dependence.AndroidX.Camera.view)
-    implementation(Dependence.AndroidX.security)
-    implementation(Dependence.AndroidX.constraintlayout)
-    implementation(Dependence.AndroidX.lifecycleSavedState)
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
+    implementation(libs.material)
+    implementation(libs.flexbox)
+    implementation(libs.cameraX.base)
+    implementation(libs.cameraX.core)
+    implementation(libs.cameraX.lifecycle)
+    implementation(libs.cameraX.view)
+    implementation(libs.androidX.security)
+    implementation(libs.androidX.constraintlayout)
+    implementation(libs.androidX.lifecycleSavedState)
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
 
-    implementation(Dependence.KotlinX.guava)
+    implementation(libs.kotlinX.coroutines.guava)
 
-    implementation(project(Dependence.UIKit.core)) {
+    implementation(project(ProjectModules.UIKit.core)) {
         exclude("com.airbnb.android", "lottie")
         exclude("com.facebook.fresco", "fresco")
     }
 
-    implementation(project(Dependence.Lib.qr))
-    implementation(project(Dependence.Lib.security))
-    implementation(project(Dependence.Lib.icu))
-    implementation(Dependence.Koin.core)
+    implementation(project(ProjectModules.Lib.qr))
+    implementation(project(ProjectModules.Lib.security))
+    implementation(project(ProjectModules.Lib.icu))
+    implementation(libs.koin.core)
 }
 

apps/signer/lint-baseline.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.12.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.12.2)" variant="fatal" version="8.12.2">
+
+</issues>

apps/signer/proguard-rules.pro

@@ -7,3 +7,9 @@
 -repackageclasses ''
 -renamesourcefileattribute SourceFile
 -dontskipnonpubliclibraryclasses
+
+-dontwarn com.fasterxml.jackson.databind.ext.Java7SupportImpl
+-keep class com.fasterxml.jackson.databind.ext.** { *; }
+-dontwarn org.slf4j.**
+-dontwarn org.w3c.dom.**
+-dontwarn com.fasterxml.jackson.databind.ext.DOMSerializer

apps/signer/src/main/java/com/tonapps/signer/screen/camera/CameraFragment.kt

@@ -71,6 +71,8 @@ class CameraFragment: BaseFragment(R.layout.fragment_camera), BaseFragment.Botto
         headerView.background = null
         headerView.doOnCloseClick = { finish() }
 
+        view.findViewById<HeaderView>(R.id.permission_header).doOnCloseClick = { finish() }
+
         cameraView = view.findViewById(R.id.camera)
         flashView = view.findViewById(R.id.flash)
 

apps/signer/src/main/java/com/tonapps/signer/screen/settings/SettingsFragment.kt

@@ -54,7 +54,7 @@ class SettingsFragment: BaseFragment(R.layout.fragment_settings), BaseFragment.S
     }
 
     private fun openSupport() {
-        val uri = Uri.parse("https://t.me/help_tonkeeper_bot")
+        val uri = Uri.parse("https://t.me/tonkeeper")
         val intent = Intent(Intent.ACTION_VIEW, uri)
         startActivity(intent)
     }

apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignFragment.kt

@@ -6,8 +6,11 @@ import android.os.Bundle
 import android.text.SpannableString
 import android.text.method.ScrollingMovementMethod
 import android.view.View
+import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.view.ViewCompat
+import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.lifecycleScope
 import com.tonapps.blockchain.ton.TonNetwork
 import com.tonapps.security.hex
@@ -36,7 +39,9 @@ import org.koin.core.parameter.parametersOf
 import org.ton.cell.Cell
 import uikit.HapticHelper
 import uikit.base.BaseFragment
+import uikit.extensions.bottomBarsOffset
 import uikit.extensions.collectFlow
+import uikit.extensions.pinToBottomInsets
 import uikit.extensions.setColor
 import uikit.navigation.Navigation.Companion.navigation
 import uikit.widget.LoaderView
@@ -129,6 +134,13 @@ class SignFragment: BaseFragment(R.layout.fragment_sign), BaseFragment.Modal {
 
         collectFlow(signViewModel.actionsFlow, adapter::submitList)
         collectFlow(signViewModel.keyEntity, ::setKeyEntity)
+
+        ViewCompat.setOnApplyWindowInsetsListener(view) { view, insets ->
+            actionView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                bottomMargin = insets.bottomBarsOffset
+            }
+            insets
+        }
     }
 
     private fun showError() {
@@ -137,7 +149,11 @@ class SignFragment: BaseFragment(R.layout.fragment_sign), BaseFragment.Modal {
     }
 
     private fun copyBody() {
-        requireContext().copyToClipboard(args.bodyHex)
+        signViewModel.openEmulate().catch {
+            navigation?.toast(R.string.unknown_error)
+        }.onEach{
+            requireContext().copyToClipboard(it)
+        }.launchIn(lifecycleScope)
     }
 
     private fun reject() {