File tree Expand file tree Collapse file tree
java/com/simplito/chatee/ui/activity Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ android {
1717 minSdk = 24
1818 targetSdk = 34
1919 versionCode = 10
20- versionName = " 2.0.1 "
20+ versionName = " 3.0 "
2121
2222 testInstrumentationRunner = " androidx.test.runner.AndroidJUnitRunner"
2323 vectorDrawables {
@@ -49,7 +49,7 @@ tasks.named(
4949 " privmxEndpointInstallJni" ,
5050 PrivmxEndpointInstallNativeTask ::class .java
5151) {
52- version = " 2.0 "
52+ version = " 2.2.1 "
5353 platforms = listOf (
5454 * (SupportedPlatforms .Android .values().map { it.platform }.toTypedArray())
5555 )
Original file line number Diff line number Diff line change @@ -219,28 +219,4 @@ abstract class BasicActivity : PrivmxEndpointBaseActivity() {
219219 privmxEndpointContainer.endpoint?.unregisterCallbacks(this )
220220 super .onStop()
221221 }
222-
223- override fun getCertPath (): String {
224- return " ${filesDir} /cacert.pem" .also {
225- installCaCerts(it)
226- }
227- }
228-
229- private fun installCaCerts (certsPath : String ) {
230- val certsInputStream =
231- BasicActivity ::class .java.getResourceAsStream(" /cacert.pem" )
232- val file = File (certsPath);
233- if (file.exists()) {
234- return ;
235- }
236- try {
237- file.outputStream().use {
238- certsInputStream?.copyTo(it)
239- certsInputStream?.close()
240- }
241- } catch (e: Exception ) {
242- e.printStackTrace();
243- }
244- }
245-
246222}
Original file line number Diff line number Diff line change @@ -188,7 +188,7 @@ class LoginActivity : BasicActivity() {
188188 return currentDomainName?.let {
189189 privmxEndpointContainer?.cryptoApi?.let { cryptoApi ->
190190 AsyncCall {
191- val privKey = cryptoApi.derivePrivateKey (
191+ val privKey = cryptoApi.derivePrivateKey2 (
192192 username,
193193 password
194194 )
@@ -262,7 +262,7 @@ class LoginActivity : BasicActivity() {
262262 ): Promise <DefaultResponseData ?>? {
263263 return privmxEndpointContainer?.cryptoApi?.let { cryptoApi ->
264264 initDomainServer()
265- val privateKey = cryptoApi.derivePrivateKey (
265+ val privateKey = cryptoApi.derivePrivateKey2 (
266266 username,
267267 password
268268 )
Original file line number Diff line number Diff line change @@ -466,6 +466,7 @@ private fun Thread.fromNewStats(threadStatsData: ThreadStatsEventData) = Thread(
466466 threadStatsData.lastMsgDate,
467467 publicMeta,
468468 privateMeta,
469+ this .policy,
469470 threadStatsData.messagesCount,
470471 0
471472)
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ lifecycleRuntimeKtx = "2.7.0"
99activityCompose = " 1.8.2"
1010composeBom = " 2024.03.00"
1111composeFoundation = " 1.6.4"
12- privmxEndpoint = " 2.0 "
12+ privmxEndpoint = " 2.2.1 "
1313appcompat = " 1.6.1"
1414serialization-json = " 1.6.2"
1515kotlin-serialization = " 1.9.21"
You can’t perform that action at this time.
0 commit comments