Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: use debug key in debug builds

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2023-05-08 14:00:09 +02:00
parent 51991324a9
commit 5cafd1ebe4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/src/main/java/com/wireguard/android/updater/Updater.kt
View File

@ -44,12 +44,14 @@ import kotlin.time.Duration.Companion.seconds
object Updater { object Updater {
private const val TAG = "WireGuard/Updater" private const val TAG = "WireGuard/Updater"
private const val LATEST_VERSION_URL = "https://download.wireguard.com/android-client/latest.sig" private const val UPDATE_URL_FMT = "https://download.wireguard.com/android-client/%s"
private const val APK_PATH_URL = "https://download.wireguard.com/android-client/%s" private const val APK_NAME_PREFIX = BuildConfig.APPLICATION_ID + "-"
private val APK_NAME_PREFIX = BuildConfig.APPLICATION_ID.removeSuffix(".debug") + "-"
private const val APK_NAME_SUFFIX = ".apk" private const val APK_NAME_SUFFIX = ".apk"
private const val RELEASE_PUBLIC_KEY_BASE64 = "RWTAzwGRYr3EC9px0Ia3fbttz8WcVN6wrOwWp2delz4el6SI8XmkKSMp"
private val CURRENT_VERSION = Version(BuildConfig.VERSION_NAME.removeSuffix("-debug")) private val CURRENT_VERSION = Version(BuildConfig.VERSION_NAME.removeSuffix("-debug"))
private val LATEST_FILE = if (BuildConfig.DEBUG) "latest-debug.sig" else "latest.sig"
private val RELEASE_PUBLIC_KEY_BASE64 =
if (BuildConfig.DEBUG) "RWTKFCNaLimMkuolGwAw12XT6sx+nnS7KE1wmhJ7YHXvAPedtPR/rofU"
else "RWTAzwGRYr3EC9px0Ia3fbttz8WcVN6wrOwWp2delz4el6SI8XmkKSMp"
private val updaterScope = CoroutineScope(Job() + Dispatchers.IO) private val updaterScope = CoroutineScope(Job() + Dispatchers.IO)
@ -213,7 +215,7 @@ object Updater {
} }
private fun checkForUpdates(): Update? { private fun checkForUpdates(): Update? {
val connection = URL(LATEST_VERSION_URL).openConnection() as HttpURLConnection val connection = URL(UPDATE_URL_FMT.format(LATEST_FILE)).openConnection() as HttpURLConnection
connection.setRequestProperty("User-Agent", Application.USER_AGENT) connection.setRequestProperty("User-Agent", Application.USER_AGENT)
connection.connect() connection.connect()
if (connection.responseCode != HttpURLConnection.HTTP_OK) if (connection.responseCode != HttpURLConnection.HTTP_OK)
@ -249,7 +251,7 @@ object Updater {
} }
emitProgress(Progress.Downloading(0UL, 0UL), true) emitProgress(Progress.Downloading(0UL, 0UL), true)
val connection = URL(APK_PATH_URL.format(update.fileName)).openConnection() as HttpURLConnection val connection = URL(UPDATE_URL_FMT.format(update.fileName)).openConnection() as HttpURLConnection
connection.setRequestProperty("User-Agent", Application.USER_AGENT) connection.setRequestProperty("User-Agent", Application.USER_AGENT)
connection.connect() connection.connect()
if (connection.responseCode != HttpURLConnection.HTTP_OK) if (connection.responseCode != HttpURLConnection.HTTP_OK)