Skip to content

Commit db7fbff

Browse files
committed
Merge branch 'release/1.5.0' into main
2 parents 56304a1 + 8a408c6 commit db7fbff

File tree

146 files changed

+8030
-1314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+8030
-1314
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ android {
2323

2424
defaultConfig {
2525
applicationId = "com.twofasapp.pass"
26-
versionName = "1.4.0"
27-
versionCode = 32
26+
versionName = "1.5.0"
27+
versionCode = 33
2828
}
2929

3030
applicationVariants.all {
2.56 KB
Binary file not shown.
2.56 KB
Binary file not shown.

app/src/main/AndroidManifest.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
android:hardwareAccelerated="true"
2020
android:icon="@mipmap/ic_launcher"
2121
android:label="@string/app_name"
22+
android:localeConfig="@xml/locales_config"
2223
android:networkSecurityConfig="@xml/network_security_config"
2324
android:supportsRtl="false"
2425
android:theme="@style/AppTheme">
@@ -76,4 +77,13 @@
7677
<receiver android:name=".notifications.browserrequest.BrowserRequestNotificationDismissReceiver" />
7778
</application>
7879

79-
</manifest>
80+
<!-- Detect autofill in browsers -->
81+
<uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
82+
83+
<queries>
84+
<package android:name="com.android.chrome" />
85+
<package android:name="com.chrome.beta" />
86+
<package android:name="com.brave.browser" />
87+
</queries>
88+
89+
</manifest>
2.56 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
3+
<locale android:name="en-US" />
4+
<locale android:name="pl-PL" />
5+
</locale-config>
2.56 KB
Binary file not shown.

buildlogic/src/main/java/com/twofasapp/buildlogic/version/SdkConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ package com.twofasapp.buildlogic.version
1010

1111
object SdkConfig {
1212
const val minSdk = 31
13-
const val targetSdk = 35
14-
const val compileSdk = 35
13+
const val targetSdk = 36
14+
const val compileSdk = 36
1515
}

config/config.properties.enc

864 Bytes
Binary file not shown.

config/debug_signing.jks.enc

2.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)