diff --git a/app/build.gradle b/app/build.gradle index 2b03596fe..6ab76c37b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -167,7 +167,7 @@ android { "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"; buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]" buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\"" - buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0=\"" + buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY\"" buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}' buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode" buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\"" @@ -346,7 +346,7 @@ android { "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")" buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]" buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\"" - buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\"" + buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARB\"" buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\"" buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\"" diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java index 7bfc84e1d..88ccd44b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/GroupsV2AuthorizationSignalStoreCache.java @@ -21,12 +21,20 @@ public final class GroupsV2AuthorizationSignalStoreCache implements GroupsV2Auth private static final String TAG = Log.tag(GroupsV2AuthorizationSignalStoreCache.class); - private static final String KEY = "gv2:auth_token_cache"; + private static final String PREFIX = "gv2:auth_token_cache"; + private static final int VERSION = 2; + private static final String KEY = PREFIX + ":" + VERSION; private final KeyValueStore store; GroupsV2AuthorizationSignalStoreCache(KeyValueStore store) { this.store = store; + + if (store.containsKey(PREFIX)) { + store.beginWrite() + .remove(PREFIX) + .commit(); + } } @Override diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle index d6cfdbf46..8b66d22c7 100644 --- a/app/witness-verifications.gradle +++ b/app/witness-verifications.gradle @@ -579,11 +579,11 @@ dependencyVerification { ['org.signal:ringrtc-android:2.13.1', '5bb5c9829053006d27e3444ae1984a3e3daece1edddb870c3f1da2c2179c40fc'], - ['org.signal:zkgroup-android:0.7.0', - '52b172565bd01526e93ebf1796b834bdc449d4fe3422c1b827e49cb8d4f13fbd'], + ['org.signal:zkgroup-android:0.8.1', + '97e18f753509248b0569bd22aeee9c2d96b09c24993e92208a2d0fbc6d413057'], - ['org.signal:zkgroup-java:0.7.0', - 'd0099eedd60d6f7d4df5b288175e5d585228ed8897789926bdab69bf8c05659f'], + ['org.signal:zkgroup-java:0.8.1', + 'ef2b7c0fa862b54dd40f0a76462f400855f4927fabe5fc0ffdd19bd01344f0c5'], ['org.slf4j:slf4j-api:1.7.24', 'baf3c7fe15fefeaf9e5b000d94547379dc48370f22a8797e239c127e7d7756ec'], diff --git a/dependencies.gradle b/dependencies.gradle index 61487d4d2..b1f17b250 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencyResolutionManagement { versionCatalogs { libs { version('signal-client', '0.9.5') - version('zkgroup', '0.7.0') + version('zkgroup', '0.8.1') version('exoplayer', '2.15.0') version('androidx-camera', '1.0.0-beta11') version('androidx-lifecycle', '2.3.1') diff --git a/libsignal/service/witness-verifications.gradle b/libsignal/service/witness-verifications.gradle index 55f704a3f..e29712792 100644 --- a/libsignal/service/witness-verifications.gradle +++ b/libsignal/service/witness-verifications.gradle @@ -30,8 +30,8 @@ dependencyVerification { ['org.reactivestreams:reactive-streams:1.0.3', '1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865'], - ['org.signal:zkgroup-java:0.7.0', - 'd0099eedd60d6f7d4df5b288175e5d585228ed8897789926bdab69bf8c05659f'], + ['org.signal:zkgroup-java:0.8.1', + 'ef2b7c0fa862b54dd40f0a76462f400855f4927fabe5fc0ffdd19bd01344f0c5'], ['org.threeten:threetenbp:1.3.6', 'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],