Skip to content

Commit a101bbe

Browse files
authored
Merge pull request #3842 from vector-im/feature/fix_jwt_release
Fix Authenticated Jitsi not working in release #3841
2 parents 37e722e + d7a3e6f commit a101bbe

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

changelog.d/3841.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Authenticated Jitsi not working in release

vector/proguard-rules.pro

+12-1
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,15 @@
6464
-keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
6565

6666
-dontwarn com.facebook.react.**
67-
-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
67+
-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
68+
69+
-keepattributes InnerClasses
70+
71+
# JWT dependencies
72+
-keep class io.jsonwebtoken.** { *; }
73+
-keepnames class io.jsonwebtoken.* { *; }
74+
-keepnames interface io.jsonwebtoken.* { *; }
75+
76+
-keep class org.bouncycastle.** { *; }
77+
-keepnames class org.bouncycastle.** { *; }
78+
-dontwarn org.bouncycastle.**

vector/src/main/res/values-it/strings.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1185,8 +1185,7 @@
11851185
<string name="open_settings">Apri le Impostazioni</string>
11861186
<string name="settings_troubleshoot_test_account_settings_title">Impostazioni account.</string>
11871187
<string name="settings_troubleshoot_test_account_settings_success">Le notifiche sono abilitate per il tuo account.</string>
1188-
<string name="settings_troubleshoot_test_account_settings_failed">Le notifiche sono disabilitate per il tuo account.
1189-
\nControlla le impostazioni dell\'account.</string>
1188+
<string name="settings_troubleshoot_test_account_settings_failed">Le notifiche sono disabilitate per il tuo account.\nControlla le impostazioni dell\'account.</string>
11901189
<string name="settings_troubleshoot_test_account_settings_quickfix">Abilita</string>
11911190
<string name="settings_troubleshoot_test_device_settings_title">Impostazioni sessione.</string>
11921191
<string name="settings_troubleshoot_test_device_settings_success">Le notifiche sono attive per questa sessione.</string>

0 commit comments

Comments
 (0)