Merge pull request #3842 from vector-im/feature/fix_jwt_release

Fix Authenticated Jitsi not working in release #3841
element-hq · Aug 17, 2021 · a101bbe · a101bbe
2 parents 37e722e + d7a3e6f
commit a101bbe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/changelog.d/3841.bugfix b/changelog.d/3841.bugfix
@@ -0,0 +1 @@
+Authenticated Jitsi not working in release
diff --git a/vector/proguard-rules.pro b/vector/proguard-rules.pro
@@ -64,4 +64,15 @@
 -keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
 
 -dontwarn com.facebook.react.**
--keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
+-keep,includedescriptorclasses class com.facebook.react.bridge.** { *; }
+
+-keepattributes InnerClasses
+
+# JWT dependencies
+-keep class io.jsonwebtoken.** { *; }
+-keepnames class io.jsonwebtoken.* { *; }
+-keepnames interface io.jsonwebtoken.* { *; }
+
+-keep class org.bouncycastle.** { *; }
+-keepnames class org.bouncycastle.** { *; }
+-dontwarn org.bouncycastle.**
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
@@ -1185,8 +1185,7 @@
     <string name="open_settings">Apri le Impostazioni</string>
     <string name="settings_troubleshoot_test_account_settings_title">Impostazioni account.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Le notifiche sono abilitate per il tuo account.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Le notifiche sono disabilitate per il tuo account.
-\nControlla le impostazioni dell\'account.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Le notifiche sono disabilitate per il tuo account.\nControlla le impostazioni dell\'account.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Abilita</string>
     <string name="settings_troubleshoot_test_device_settings_title">Impostazioni sessione.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Le notifiche sono attive per questa sessione.</string>