Feat/cyberpunk redesign moga vpn

.gitlab-ci.yml

@@ -97,7 +97,11 @@ UploadToNexusPublic:
     - echo "$signKey" | base64 -d -i > $SIGN_KEY_PATH
     - export GRADLE_USER_HOME=$(pwd)/.gradle
     - chmod +x ./gradlew
+<<<<<<< HEAD
+    - extras ndk -n 23.2.8568313 -c 3.22.1
+=======
     - extras ndk -n 27.2.12479018 -c 3.22.1
+>>>>>>> origin/develop
     - extras fastlane
     - apk --no-cache add swig
     - fastlane updateBuildVersion
@@ -129,7 +133,11 @@ UploadToNexusPublic:
     - echo "$signKey" | base64 -d -i > $SIGN_KEY_PATH
     - export GRADLE_USER_HOME=$(pwd)/.gradle
     - chmod +x ./gradlew
+<<<<<<< HEAD
+    - extras ndk -n 23.2.8568313 -c 3.22.1
+=======
     - extras ndk -n 27.2.12479018 -c 3.22.1
+>>>>>>> origin/develop
     - extras fastlane
     - apk --no-cache add swig
     - fastlane keepBuildVersion
@@ -161,6 +169,9 @@ Slack:
   stage: Deploy
   before_script:
     - extras fastlane
+<<<<<<< HEAD
+    - apk --no-cache add curl
+=======
     - apk --no-cache add curl
 
 BuildStrongswan:
@@ -241,3 +252,4 @@ BuildStrongswan:
     paths:
       - $CI_PROJECT_DIR/artifacts/strongswan-libs.zip
     expire_in: 1 week
+>>>>>>> origin/develop

base/build.gradle

@@ -5,7 +5,11 @@ apply from: "$rootDir/config/config.gradle"
 apply from: "$rootDir/depedencycheck.gradle"
 
 android {
+<<<<<<< HEAD
+    ndkVersion "23.0.7599858"
+=======
     ndkVersion "27.2.12479018"
+>>>>>>> origin/develop
     compileOptions {
         sourceCompatibility rootProject.java
         targetCompatibility rootProject.java
@@ -54,10 +58,17 @@ android {
                 def version = details.requested.version
                 def versionData = version.split('-')
                 if (versionData.contains('jre')) {
+<<<<<<< HEAD
+                    details.useVersion "30.1.1-jre"
+                }
+                if (versionData.contains('android')) {
+                    details.useVersion "30.1.1-android"
+=======
                     details.useVersion "32.1.2-jre"
                 }
                 if (versionData.contains('android')) {
                     details.useVersion "32.1.2-android"
+>>>>>>> origin/develop
                 }
             }
             if (details.requested.group == 'junit') {
@@ -99,15 +110,23 @@ dependencies {
     api project(path: ':wgtunnel')
     //Rxjava
     api 'io.reactivex.rxjava2:rxandroid:2.1.1'
+<<<<<<< HEAD
+    api 'io.reactivex.rxjava2:rxjava:2.2.13'
+=======
     api 'io.reactivex.rxjava2:rxjava:2.2.19'
+>>>>>>> origin/develop
     //Retrofit
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     api "com.squareup.retrofit2:converter-gson:$retrofit"
     implementation "com.squareup.retrofit2:converter-scalars:$retrofit"
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
     //Okhttp
     implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
+<<<<<<< HEAD
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+=======
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+>>>>>>> origin/develop
     api 'com.squareup.okhttp3:mockwebserver:4.9.3'
     //Logging
     api 'org.slf4j:slf4j-api:1.7.36'
@@ -117,7 +136,10 @@ dependencies {
     }
     //Room
     api "androidx.room:room-rxjava2:$room"
+<<<<<<< HEAD
+=======
     api "androidx.room:room-ktx:$room"
+>>>>>>> origin/develop
     api "androidx.room:room-runtime:$room"
     kapt "androidx.room:room-compiler:$room"
     implementation "androidx.room:room-testing:$room"
@@ -140,14 +162,26 @@ dependencies {
     kapt "com.github.bumptech.glide:compiler:$glide"
     api 'commons-io:commons-io:2.11.0'
     api 'com.github.thoughtbot.expandable-recycler-view:expandablerecyclerview:v1.3'
+<<<<<<< HEAD
+    api 'com.jakewharton:butterknife:10.2.0'
+    kapt 'com.jakewharton:butterknife-compiler:10.2.3'
+    api 'com.google.guava:guava:30.1.1-android'
+=======
     api 'com.google.guava:guava:32.1.2-android'
+>>>>>>> origin/develop
     api 'com.github.GCX-HCI:tray:v0.12.0'
     implementation 'org.isomorphism:token-bucket:1.6'
     // Test
     testImplementation "junit:junit:$JUnit"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
     testImplementation 'org.junit.jupiter:junit-jupiter'
+<<<<<<< HEAD
+    // ECH Conscrypt
+    implementation 'info.guardianproject.conscrypt:conscrypt-android:2.6.alpha1638179154.job1828169525'
+    implementation 'commons-io:commons-io:2.11.0'
+=======
     implementation 'commons-io:commons-io:2.13.0'
+>>>>>>> origin/develop
     implementation 'commons-net:commons-net:3.6'
     // Google only dependencies
     googleApi "com.google.firebase:firebase-messaging:$fireBase"
@@ -156,5 +190,8 @@ dependencies {
     googleApi 'com.android.billingclient:billing:7.0.0'
     googleApi "com.google.android.gms:play-services-appset:16.0.2"
     googleApi 'com.google.android.play:review-ktx:2.0.1'
+<<<<<<< HEAD
+=======
     googleApi 'com.google.android.gms:play-services-auth:20.4.1'
+>>>>>>> origin/develop
 }

base/src/fdroid/java/com/windscribe/vpn/di/ApplicationComponent.kt

@@ -22,7 +22,10 @@ import com.windscribe.vpn.mocklocation.MockLocationManager
 import com.windscribe.vpn.repository.*
 import com.windscribe.vpn.services.FirebaseManager
 import com.windscribe.vpn.services.ReceiptValidator
+<<<<<<< HEAD
+=======
 import com.windscribe.vpn.services.sso.GoogleSignInManager
+>>>>>>> origin/develop
 import com.windscribe.vpn.state.*
 import com.windscribe.vpn.workers.WindScribeWorkManager
 import com.windscribe.vpn.workers.worker.*
@@ -71,7 +74,10 @@ interface ApplicationComponent {
     val firebaseManager: FirebaseManager
     val proxyDNSManager: ProxyDNSManager
     val dynamicShortCutManager: DynamicShortcutManager
+<<<<<<< HEAD
+=======
     val googleSignInManager: GoogleSignInManager
+>>>>>>> origin/develop
 
     //Repository
     val staticIpRepository: StaticIpRepository

base/src/fdroid/java/com/windscribe/vpn/di/ApplicationModule.kt

@@ -9,8 +9,11 @@ import com.windscribe.vpn.backend.AndroidDeviceIdentityImpl
 import com.windscribe.vpn.services.FirebaseManager
 import com.windscribe.vpn.services.ReceiptValidator
 import com.windscribe.vpn.services.firebasecloud.FirebaseManagerImpl
+<<<<<<< HEAD
+=======
 import com.windscribe.vpn.services.sso.GoogleSignInManager
 import com.windscribe.vpn.services.sso.GoogleSignInManagerImpl
+>>>>>>> origin/develop
 import com.windscribe.vpn.workers.WindScribeWorkManager
 import dagger.Module
 import dagger.Provides
@@ -39,10 +42,13 @@ class ApplicationModule(override var windscribeApp: Windscribe) : BaseApplicatio
     fun provideAndroidIdentity(): AndroidDeviceIdentity {
         return AndroidDeviceIdentityImpl()
     }
+<<<<<<< HEAD
+=======
 
     @Provides
     @Singleton
     fun providesGoogleSignInManager(): GoogleSignInManager {
         return GoogleSignInManagerImpl(windscribeApp)
     }
+>>>>>>> origin/develop
 }