Skip to content

Commit

Permalink
Merge pull request #123 from akwizgran/onionwrapper-0.1.0
Browse files Browse the repository at this point in the history
Upgrade onionwrapper to 0.1.0 and snowflake to 2.9.1
  • Loading branch information
grote authored Mar 12, 2024
2 parents ba204f8 + f2169cb commit 32055c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ dependencies {
kapt "com.google.dagger:hilt-compiler:$hilt_version"

// Tor
implementation "org.briarproject:onionwrapper-android:0.0.7"
implementation "org.briarproject:onionwrapper-android:0.1.0"
tor 'org.briarproject:tor-android:0.4.8.9-1'
tor 'org.briarproject:obfs4proxy-android:0.0.14-tor2'
tor 'org.briarproject:snowflake-android:2.5.1'
tor 'org.briarproject:snowflake-android:2.9.1'
implementation 'org.briarproject:moat-api:0.2'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'

Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/onionshare/android/tor/TorManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.onionshare.android.tor
import android.app.Application
import android.content.Context.MODE_PRIVATE
import android.content.Intent
import android.os.Build.VERSION.SDK_INT
import androidx.core.content.ContextCompat.startForegroundService
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers
Expand Down Expand Up @@ -211,7 +210,7 @@ class TorManager(
LOG.info("Using built-in bridges...")
val countryCode = locationUtils.currentCountry
val builtInBridges = circumventionProvider.getSuitableBridgeTypes(countryCode).flatMap { type ->
circumventionProvider.getBridges(type, countryCode, SDK_INT >= 25)
circumventionProvider.getBridges(type, countryCode)
}
try {
useBridges(builtInBridges)
Expand Down

0 comments on commit 32055c8

Please sign in to comment.