v055v #2505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

hussainmohd-a wants to merge 43 commits into celzero:main from hussainmohd-a:v055n

+11,275 −2,976

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ app/src/headless/assets @@
     /tools
     /.kotlin/sessions
     app/google-services.json
+    /app/release
     app/fdroidFull/release
     app/playFull/release
     app/websiteFull/release

app/build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,18 +4,6 @@ plugins {
  
        id 'kotlin-android'

    }

    // ensure consistent JVM version for Java and Kotlin compilation

    // kotl.in/gradle/jvm/toolchain

    java {

        toolchain {

            languageVersion = JavaLanguageVersion.of(17)

        }

    }

    kotlin {

        jvmToolchain(17)

    }

    // apply Google Services and Firebase Crashlytics plugins conditionally

    // strategy: For command-line builds, check task names. For IDE, always apply plugins

    // but they'll only process play/website variants (Firebase deps are scoped to those variants)

    @@ -79,6 +67,13 @@ try {
  
        keystoreProperties['storePassword'] = ''

    }

    // ref: developer.android.com/build/jdks#target-compat

    java {

        toolchain {

            languageVersion = JavaLanguageVersion.of(17)

        }

    }

    android {

        compileSdkVersion(36)

        // https://developer.android.com/studio/build/configure-app-module

    @@ -155,7 +150,7 @@ android {
  
                // the setting to true

                minifyEnabled true

                shrinkResources true

                proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

                proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

                ndk {

                    // Use SYMBOL_TABLE to reduce symbol file size significantly

                    debugSymbolLevel 'SYMBOL_TABLE'

    @@ -289,7 +284,7 @@ dependencies {
  
        fullImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20'

        fullImplementation 'androidx.appcompat:appcompat:1.7.1'

        fullImplementation 'androidx.core:core-ktx:1.16.0'

        fullImplementation 'androidx.core:core-ktx:1.17.0'

        implementation 'androidx.preference:preference-ktx:1.2.1'

        fullImplementation 'androidx.constraintlayout:constraintlayout:2.2.1'

        fullImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    @@ -358,7 +353,7 @@ dependencies {
  
        playImplementation firestackDependency()

        // Work manager

        implementation('androidx.work:work-runtime-ktx:2.10.5') {

        implementation('androidx.work:work-runtime-ktx:2.11.0') {

            modules {

                module("com.google.guava:listenablefuture") {

                    replacedBy("com.google.guava:guava", "listenablefuture is part of guava")

    @@ -378,20 +373,20 @@ dependencies {
  
        testImplementation 'org.robolectric:robolectric:4.16'

        testImplementation 'androidx.test:core:1.7.0'

        testImplementation 'androidx.test.ext:junit:1.3.0'

        testImplementation 'org.mockito:mockito-core:5.20.0'

        testImplementation 'org.mockito:mockito-core:5.21.0'

        // Added test dependencies for comprehensive testing

        testImplementation 'io.mockk:mockk:1.14.6'

        testImplementation 'io.mockk:mockk-android:1.14.6'

        testImplementation 'io.mockk:mockk:1.14.7'

        testImplementation 'io.mockk:mockk-android:1.14.7'

        testImplementation 'androidx.arch.core:core-testing:2.2.0'

        testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2'

        testImplementation 'io.insert-koin:koin-test:4.1.1'

        testImplementation 'io.insert-koin:koin-test-junit4:4.1.1'

        androidTestImplementation 'io.mockk:mockk-android:1.14.6'

        androidTestImplementation 'io.mockk:mockk-android:1.14.7'

        leakCanaryImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'

        fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.9.5'

        fullImplementation 'androidx.navigation:navigation-ui-ktx:2.9.5'

        fullImplementation 'androidx.navigation:navigation-fragment-ktx:2.9.6'

        fullImplementation 'androidx.navigation:navigation-ui-ktx:2.9.6'

        fullImplementation 'androidx.biometric:biometric:1.1.0'

    @@ -410,23 +405,23 @@ dependencies {
  
        // for confetti animation

        fullImplementation 'nl.dionsegijn:konfetti-xml:2.0.5'

        // for in-app purchases

        //playImplementation 'com.android.billingclient:billing:8.0.0'

        //websiteImplementation 'com.android.billingclient:billing:8.0.0'

        playImplementation 'com.android.billingclient:billing:8.3.0'

        websiteImplementation 'com.android.billingclient:billing:8.3.0'

        // for stripe payment gateway

        //websiteImplementation 'com.stripe:stripe-android:21.21.0'

        //fdroidImplementation 'com.stripe:stripe-android:21.21.0'

        lintChecks 'com.android.security.lint:lint:1.0.3'

        lintChecks 'com.android.security.lint:lint:1.0.4'

        // battery optimization permission helper

        implementation 'com.waseemsabir:betterypermissionhelper:1.0.3'

        // Firebase dependencies for error reporting (website and play variants only)

        websiteImplementation platform('com.google.firebase:firebase-bom:34.6.0')

        websiteImplementation platform('com.google.firebase:firebase-bom:34.7.0')

        websiteImplementation 'com.google.firebase:firebase-crashlytics'

        websiteImplementation 'com.google.firebase:firebase-crashlytics-ndk'

        playImplementation platform('com.google.firebase:firebase-bom:34.6.0')

        playImplementation platform('com.google.firebase:firebase-bom:34.7.0')

        playImplementation 'com.google.firebase:firebase-crashlytics'

        playImplementation 'com.google.firebase:firebase-crashlytics-ndk'

    }

app/src/full/AndroidManifest.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -170,14 +170,15 @@ @@
                 android:finishOnTaskLaunch="true" />
             <activity android:name=".ui.activity.RpnWinProxyDetailsActivity"
                 android:finishOnTaskLaunch="true" />
-            <activity
-                android:name=".ui.activity.BubbleActivity"
+            <activity android:name=".ui.activity.BubbleActivity"
                 android:allowEmbedded="true"
                 android:resizeableActivity="true"
                 android:exported="false"
                 android:excludeFromRecents="true"
                 android:taskAffinity=""
                 android:launchMode="standard"/>
+            <activity android:name=".ui.activity.ServerWgConfigDetailActivity"
+                        android:finishOnTaskLaunch="true" />
            <!-- <activity android:name=".ui.location.LocationSelectorActivity"
                 android:finishOnTaskLaunch="true" />-->
@@ Expand Down @@

app/src/full/java/com/celzero/bravedns/ServiceModuleProvider.kt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -23,6 +23,8 @@ import com.celzero.bravedns.scheduler.ScheduleManager
  
    import com.celzero.bravedns.scheduler.WorkScheduler

    import com.celzero.bravedns.service.AppUpdater

    import com.celzero.bravedns.service.ServiceModule

    import com.celzero.bravedns.subscription.StateMachineDatabaseSyncService

    import com.celzero.bravedns.subscription.SubscriptionStateMachineV2

    import com.celzero.bravedns.util.Constants

    import com.celzero.bravedns.util.OrbotHelper

    import com.celzero.bravedns.viewmodel.ViewModelModule

    @@ -47,13 +49,13 @@ private val appDownloadManagerModule = module {
  
    private val workerModule = module { single { WorkScheduler(androidContext()) } }

    private val schedulerModule = module { single { ScheduleManager(androidContext()) } }

    /*

    private val stateMachine = module {

        single { SubscriptionStateMachineV2() }

        single { StateMachineDatabaseSyncService() }

    }*/

    }

    //private val stateMachineModules = listOf(stateMachine)

    private val stateMachineModules = listOf(stateMachine)

    val AppModules: List<Module> by lazy {

        mutableListOf<Module>().apply {

    @@ -62,7 +64,7 @@ val AppModules: List<Module> by lazy {
  
            addAll(ViewModelModule.modules)

            addAll(DataModule.modules)

            addAll(ServiceModule.modules)

            //addAll(stateMachineModules)

            addAll(stateMachineModules)

            addAll(updaterModules)

            add(schedulerModule)

            add(workerModule)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

v055v #2505

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

v055v #2505

Are you sure you want to change the base?

v055v #2505

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!