Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion analytics/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ dependencies {
implementation(project(":domain"))

// Analytics
implementation(lib.mega.analytics)
// implementation(lib.mega.analytics)
implementation(project(":dependency"))

// DI
implementation(lib.javax.inject)
Expand Down
31 changes: 21 additions & 10 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@ dependencies {
implementation(project(":feature:devicecenter"))
implementation(project(":shared:resources"))
implementation(project(":feature:chat"))
preBuiltSdkDependency(rootProject.extra)
// preBuiltSdkDependency(rootProject.extra)
implementation(files("../dependency/sdk-20250425.090537-rel.aar"))


//Test Modules
testImplementation(project(":core-test"))
Expand Down Expand Up @@ -260,7 +262,8 @@ dependencies {
implementation(lib.coil.compose)
implementation(androidx.paging.compose)
implementation(lib.kotlinx.collections.immutable)
implementation(lib.mega.core.ui)
// implementation(lib.mega.core.ui)
implementation(project(":dependency"))
implementation(androidx.material3)
implementation(androidx.material3.adaptive)
implementation(androidx.material3.adaptive.layout)
Expand Down Expand Up @@ -326,19 +329,27 @@ dependencies {
implementation(lib.simplestorage)
implementation(lib.compose.state.events)
implementation(testlib.hamcrest)
implementation(lib.mega.analytics)
// implementation(lib.mega.analytics)
implementation(project(":dependency"))
implementation(lib.kotlin.serialisation)
implementation(lib.zoomable.telephoto)
implementation(lib.zoomable.image.coil)
implementation(lib.zoomable.image.core)
implementation(lib.zoomable.image.subsampling.image)
implementation(lib.telephoto.flick)
implementation(project(":dependency"))
// implementation(lib.zoomable.telephoto)
// implementation(lib.zoomable.image.coil)
// implementation(lib.zoomable.image.core)
// implementation(lib.zoomable.image.subsampling.image)
// implementation(lib.telephoto.flick)
implementation("me.saket.telephoto:zoomable-image-coil:0.15.1")
implementation("me.saket.telephoto:zoomable:0.15.1")
// implementation("me.saket.telephoto:zoomable-image-core:0.15.1")
// implementation("me.saket.telephoto:sub-sampling-image:0.15.1")
implementation("me.saket.telephoto:flick:0.15.1")

implementation(lib.commonmark.java)
implementation(google.ump)

// Debug
debugImplementation(lib.nocturn)
debugImplementation(lib.xray)
// debugImplementation(lib.nocturn)
// debugImplementation(lib.xray)

if (!shouldUsePrebuiltSdk()) {
implementation(files("../sdk/src/main/jni/megachat/webrtc/libwebrtc.jar"))
Expand Down
6 changes: 3 additions & 3 deletions app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
tools:node="merge"
tools:replace="android:authorities">

<meta-data
android:name="mega.privacy.android.app.initializer.NocturnInitializer"
android:value="androidx.startup" />
<!-- <meta-data-->
<!-- android:name="mega.privacy.android.app.initializer.NocturnInitializer"-->
<!-- android:value="androidx.startup" />-->

<meta-data
android:name="mega.privacy.android.app.initializer.KarmaInitializer"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package mega.privacy.android.app.initializer

import android.content.Context
import androidx.startup.Initializer
import mega.privacy.android.app.BuildConfig
import mega.privacy.android.nocturn.NocturnImpl
import mega.privacy.android.nocturn.notification.NocturnNotificator

/**
* Nocturn initializer
*/
class NocturnInitializer : Initializer<Unit> {
override fun create(context: Context) {
if (!BuildConfig.ACTIVATE_NOCTURN) return

val notificator = NocturnNotificator(context)
val nocturn = NocturnImpl(notificator)
nocturn.monitor(waitTimeout = BuildConfig.NOCTURN_TIMEOUT)
}

override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
}
//package mega.privacy.android.app.initializer
//
//import android.content.Context
//import androidx.startup.Initializer
//import mega.privacy.android.app.BuildConfig
//import mega.privacy.android.nocturn.NocturnImpl
//import mega.privacy.android.nocturn.notification.NocturnNotificator
//
///**
// * Nocturn initializer
// */
//class NocturnInitializer : Initializer<Unit> {
// override fun create(context: Context) {
// if (!BuildConfig.ACTIVATE_NOCTURN) return
//
// val notificator = NocturnNotificator(context)
// val nocturn = NocturnImpl(notificator)
// nocturn.monitor(waitTimeout = BuildConfig.NOCTURN_TIMEOUT)
// }
//
// override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
//}
13 changes: 13 additions & 0 deletions app/src/debug/res/values/google_maps_api.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<resources>
<!--
TODO: Before you run your application, you need a Google Maps API key.

To get one, follow the directions here:
https://developers.google.com/maps/documentation/android/start#get-key

Once you have your key (it starts with "AIza"), replace the "google_maps_key"
string in this file.
-->

<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false"></string>
</resources>
21 changes: 21 additions & 0 deletions app/src/release/res/values/google_maps_api.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<resources>
<!--
TODO: Before you release your application, you need a Google Maps API key.

To do this, you can either add your release key credentials to your existing
key, or create a new key.

Note that this file specifies the API key for the release build target.
If you have previously set up a key for the debug target with the debug signing certificate,
you will also need to set up a key for your release certificate.

Follow the directions here:

https://developers.google.com/maps/documentation/android/signup

Once you have your key (it starts with "AIza"), replace the "google_maps_key"
string in this file.
-->

<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false"></string>
</resources>
56 changes: 28 additions & 28 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import mega.privacy.android.build.isServerBuild
plugins {
alias(plugin.plugins.kotlin.compose) apply false
alias(plugin.plugins.ksp) apply false
alias(plugin.plugins.mega.android.cicd)
alias(plugin.plugins.mega.android.release)
// alias(plugin.plugins.mega.android.cicd)
// alias(plugin.plugins.mega.android.release)
alias(plugin.plugins.jfrog.artifactory) apply false
alias(plugin.plugins.mega.artifactory.publish.convention) apply false
// alias(plugin.plugins.mega.artifactory.publish.convention) apply false
alias(plugin.plugins.de.mannodermaus.android.junit5) apply false
alias(plugin.plugins.jetbrains.kotlin.android) apply false
}
Expand Down Expand Up @@ -45,31 +45,31 @@ allprojects {
maven {
url = uri("https://jitpack.io")
}
maven {
url =
uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-sdk-android")
}
maven {
url =
uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mobile-analytics")
}
maven {
url =
uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/core-ui")
}
maven {
url =
uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/dev-tools")
}
maven {
url =
uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/karma")
}

maven {
url =
uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-telephoto")
}
// maven {
// url =
// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-sdk-android")
// }
// maven {
// url =
// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mobile-analytics")
// }
// maven {
// url =
// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/core-ui")
// }
// maven {
// url =
// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/dev-tools")
// }
// maven {
// url =
// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/karma")
// }
//
// maven {
// url =
// uri("${System.getenv("ARTIFACTORY_BASE_URL")}/artifactory/mega-gradle/mega-telephoto")
// }
}
configurations.all {
resolutionStrategy.cacheDynamicVersionsFor(5, "minutes")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ fun DependencyHandlerScope.preBuiltSdkDependency(extra: ExtraPropertiesExtension
if (shouldUsePrebuiltSdk()) {
println("use remote pre-built SDK")
val megaSdkVersion = extra.get("megaSdkVersion") as String
"implementation"("nz.mega.sdk:sdk:$megaSdkVersion")
// "implementation"("nz.mega.sdk:sdk:$megaSdkVersion")
// "implementation"(project(":dependency"))
// "implementation"(files("../dependency/sdk-20250425.090537-rel.aar"))
} else {
println("use local SDK")
"implementation"(project(":sdk"))
Expand Down
3 changes: 2 additions & 1 deletion core-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ dependencies {
implementation(platform(testlib.junit5.bom))
implementation(testlib.junit.test.ktx)
implementation(testlib.junit.jupiter.api)
implementation(lib.mega.analytics)
// implementation(lib.mega.analytics)
implementation(project(":dependency"))
}
3 changes: 2 additions & 1 deletion data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ dependencies {
//Test Modules
testImplementation(project(":core-test"))

preBuiltSdkDependency(rootProject.extra)
// preBuiltSdkDependency(rootProject.extra)
implementation(files("../dependency/sdk-20250425.090537-rel.aar"))

implementation(lib.coroutines.core)
implementation(lib.kotlin.serialisation)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 7 additions & 0 deletions dependency/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
configurations.maybeCreate("default")
artifacts.add("default", file("analytics-annotations-android-20250506.075649.aar"))
artifacts.add("default", file("analytics-core-android-20250506.075649.aar"))
artifacts.add("default", file("analytics-events-android-20250506.075649.aar"))
//artifacts.add("default", file("sdk-20250430.033435"))
artifacts.add("default", file("ui-2.128.20250415022409.aar"))
artifacts.add("default", file("ui-tokens-2.128.20250415022409.aar"))
Binary file added dependency/sdk-20250425.090537-rel.aar
Binary file not shown.
Binary file added dependency/ui-2.128.20250415022409.aar
Binary file not shown.
Binary file added dependency/ui-tokens-2.128.20250415022409.aar
Binary file not shown.
3 changes: 2 additions & 1 deletion feature/chat/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ dependencies {
implementation(project(":icon-pack"))
implementation(project(":shared:resources"))
implementation(project(":domain"))
implementation(lib.mega.core.ui)
// implementation(lib.mega.core.ui)
implementation(project(":dependency"))
implementation(androidx.material3.window)
implementation(androidx.bundles.compose.bom)
implementation(androidx.material3)
Expand Down
6 changes: 4 additions & 2 deletions feature/devicecenter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ android {
}

dependencies {
preBuiltSdkDependency(rootProject.extra)
// preBuiltSdkDependency(rootProject.extra)
implementation(files("../../dependency/sdk-20250425.090537-rel.aar"))

implementation(project(":core:formatter"))
lintChecks(project(":lint"))
Expand All @@ -38,7 +39,8 @@ dependencies {
testImplementation(project(":core-test"))
testImplementation(project(":core-ui-test"))

implementation(lib.mega.analytics)
// implementation(lib.mega.analytics)
implementation(project(":dependency"))
implementation(lib.kotlin.ktx)
implementation(lib.logging.timber)
implementation(androidx.appcompat)
Expand Down
6 changes: 4 additions & 2 deletions feature/sync/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ dependencies {
testImplementation(project(":core-test"))
testImplementation(project(":core-ui-test"))
lintChecks(project(":lint"))
preBuiltSdkDependency(rootProject.extra)
// preBuiltSdkDependency(rootProject.extra)
implementation(files("../../dependency/sdk-20250425.090537-rel.aar"))

implementation(project(":domain"))
implementation(project(":data"))
Expand All @@ -43,7 +44,8 @@ dependencies {

implementation(lib.kotlin.ktx)
implementation(lib.logging.timber)
implementation(lib.mega.analytics)
// implementation(lib.mega.analytics)
implementation(project(":dependency"))

implementation(google.gson)
implementation(androidx.datastore.preferences)
Expand Down
10 changes: 5 additions & 5 deletions gradle/catalogs/lib.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ karma = "1.3"
kotlin-serialisation = "1.8.1"
eclipse-jgit = "6.6.0.202305301015-r"
json = "20240303"
mega-telephoto = "0.15.2"
mega-telephoto = "0.15.1"
telephoto = "0.14.0"
mega-core-ui = "2.128.20250415022409"
kotlinx-collections-immutable = "0.3.7"
Expand Down Expand Up @@ -66,10 +66,10 @@ kotlin-serialisation = { module = "org.jetbrains.kotlinx:kotlinx-serialization-j
eclipse-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit"}
eclipse-jgit-ssh-jsch = { module = "org.eclipse.jgit:org.eclipse.jgit.ssh.jsch", version.ref = "eclipse-jgit"}
json = { module = "org.json:json", version.ref = "json"}
zoomable-telephoto = { module = "me.saket.telephoto.mega:zoomable", version.ref = "mega-telephoto" }
zoomable-image-coil = { module = "me.saket.telephoto.mega:zoomable-image-coil", version.ref = "mega-telephoto" }
zoomable-image-core = { module = "me.saket.telephoto.mega:zoomable-image-core", version.ref = "mega-telephoto" }
zoomable-image-subsampling-image = { module = "me.saket.telephoto.mega:sub-sampling-image", version.ref = "mega-telephoto" }
zoomable-telephoto = { module = "me.saket.telephoto:zoomable", version.ref = "mega-telephoto" }
zoomable-image-coil = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "mega-telephoto" }
zoomable-image-core = { module = "me.saket.telephoto:zoomable-image-core", version.ref = "mega-telephoto" }
zoomable-image-subsampling-image = { module = "me.saket.telephoto:sub-sampling-image", version.ref = "mega-telephoto" }
telephoto-flick = { module = "me.saket.telephoto:flick", version.ref = "telephoto" }
mega-core-ui = { group = "mega.android.core", name = "ui", version.ref = "mega-core-ui" }
mega-core-ui-tokens = { group = "mega.android.core", name = "ui-tokens", version.ref = "mega-core-ui"}
Expand Down
3 changes: 2 additions & 1 deletion navigation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ dependencies {
implementation(project(":domain"))
implementation(androidx.appcompat)
implementation(androidx.navigation.compose)
implementation(lib.mega.analytics)
// implementation(lib.mega.analytics)
implementation(project(":dependency"))

testImplementation(testlib.bundles.ui.test)
testImplementation(testlib.bundles.unit.test)
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/main/jni/megachat/sdk
Submodule sdk updated 29 files
+24 −0 contrib/cmake/vcpkg_overlay_ports/curl/0002_fix_uwp.patch
+18 −0 contrib/cmake/vcpkg_overlay_ports/curl/0012-fix-dependency-idn2.patch
+15 −0 contrib/cmake/vcpkg_overlay_ports/curl/0020-fix-pc-file.patch
+12 −0 contrib/cmake/vcpkg_overlay_ports/curl/0022-deduplicate-libs.patch
+75 −2 contrib/cmake/vcpkg_overlay_ports/curl/cmake-project-include.cmake
+52 −139 contrib/cmake/vcpkg_overlay_ports/curl/dependencies.patch
+11 −10 contrib/cmake/vcpkg_overlay_ports/curl/export-components.patch
+14 −0 contrib/cmake/vcpkg_overlay_ports/curl/mbedtls-ws2_32.patch
+0 −106 contrib/cmake/vcpkg_overlay_ports/curl/pkgconfig-curl-config.patch
+23 −26 contrib/cmake/vcpkg_overlay_ports/curl/portfile.cmake
+17 −0 contrib/cmake/vcpkg_overlay_ports/curl/vcpkg-cmake-wrapper.cmake
+5 −65 contrib/cmake/vcpkg_overlay_ports/curl/vcpkg.json
+25 −0 contrib/cmake/vcpkg_overlay_ports/libmediainfo/msvc-arm.diff
+56 −0 contrib/cmake/vcpkg_overlay_ports/libmediainfo/no-windows-namespace.diff
+3 −1 contrib/cmake/vcpkg_overlay_ports/libmediainfo/portfile.cmake
+1 −1 contrib/cmake/vcpkg_overlay_ports/libmediainfo/vcpkg.json
+0 −1,398 contrib/cmake/vcpkg_overlay_ports/libwebsockets/cmake-version.patch
+32 −0 contrib/cmake/vcpkg_overlay_ports/libwebsockets/fix-enum-int-mismatch.patch
+11 −0 contrib/cmake/vcpkg_overlay_ports/libwebsockets/fix-find-openssl.patch
+11 −8 contrib/cmake/vcpkg_overlay_ports/libwebsockets/portfile.cmake
+12 −4 contrib/cmake/vcpkg_overlay_ports/libwebsockets/vcpkg.json
+0 −5 contrib/cmake/vcpkg_overlay_ports/webrtc/Config.cmake.in
+0 −26 contrib/cmake/vcpkg_overlay_ports/webrtc/fix_external_libjpeg.patch
+1 −10 contrib/cmake/vcpkg_overlay_ports/webrtc/portfile.cmake
+1 −2 contrib/cmake/vcpkg_overlay_ports/webrtc/vcpkg.json
+0 −1 dockerfile/android-cross-build.dockerfile
+5 −9 src/chatClient.cpp
+1 −2 src/chatd.h
+45 −57 vcpkg.json
Loading