Implement new ip parameter for captcha check

proxer · Oct 26, 2019 · aa21e0e · aa21e0e
1 parent 8a589a5
commit aa21e0e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -79,7 +79,7 @@ ext {
     gravitySnapHelperVersion = "2.2.0"
 
     // Utils
-    proxerLibVersion = "70ee4f0858"
+    proxerLibVersion = "891bb378a4"
     threetenVersion = "1.2.1"
     hawkVersion = "7a1a625455"
     glideVersion = "4.10.0"

diff --git a/src/main/kotlin/me/proxer/app/base/BaseContentFragment.kt b/src/main/kotlin/me/proxer/app/base/BaseContentFragment.kt
@@ -23,6 +23,7 @@ import me.proxer.app.R
 import me.proxer.app.util.ErrorUtils.ErrorAction
 import me.proxer.app.util.ErrorUtils.ErrorAction.Companion.ACTION_MESSAGE_DEFAULT
 import me.proxer.app.util.ErrorUtils.ErrorAction.Companion.ACTION_MESSAGE_HIDE
+import me.proxer.app.util.Utils
 import me.proxer.app.util.compat.isConnected
 import me.proxer.app.util.extension.resolveColor
 import me.proxer.library.enums.Device
@@ -150,7 +151,7 @@ abstract class BaseContentFragment<T>(@LayoutRes contentLayoutId: Int) : BaseFra
                     true -> {
                         isSolvingCaptcha = true
 
-                        showPage(ProxerUrls.captchaWeb(Device.MOBILE))
+                        showPage(ProxerUrls.captchaWeb(Utils.getIpAddress(), Device.MOBILE))
                     }
                     false -> action.toClickListener(hostingActivity)?.onClick(errorButton) ?: viewModel.load()
                 }

diff --git a/src/main/kotlin/me/proxer/app/util/ErrorUtils.kt b/src/main/kotlin/me/proxer/app/util/ErrorUtils.kt
@@ -323,7 +323,9 @@ object ErrorUtils : KoinComponent {
         }
 
         fun toClickListener(activity: BaseActivity) = when (buttonAction) {
-            CAPTCHA -> View.OnClickListener { activity.showPage(ProxerUrls.captchaWeb(Device.MOBILE)) }
+            CAPTCHA -> View.OnClickListener {
+                activity.showPage(ProxerUrls.captchaWeb(Utils.getIpAddress(), Device.MOBILE))
+            }
             NETWORK_SETTINGS -> View.OnClickListener {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                     activity.startActivity(Intent(Settings.Panel.ACTION_INTERNET_CONNECTIVITY))
@@ -343,7 +345,10 @@ object ErrorUtils : KoinComponent {
         }
 
         fun toIntent() = when (buttonAction) {
-            CAPTCHA -> Intent(Intent.ACTION_VIEW, ProxerUrls.captchaWeb(Device.MOBILE).androidUri())
+            CAPTCHA -> Intent(
+                Intent.ACTION_VIEW,
+                ProxerUrls.captchaWeb(Utils.getIpAddress(), Device.MOBILE).androidUri()
+            )
             else -> null
         }
 

diff --git a/src/main/kotlin/me/proxer/app/util/Utils.kt b/src/main/kotlin/me/proxer/app/util/Utils.kt
@@ -10,6 +10,7 @@ import me.proxer.app.util.extension.androidUri
 import okhttp3.HttpUrl
 import org.threeten.bp.format.DateTimeFormatter
 import timber.log.Timber
+import java.net.NetworkInterface
 
 /**
  * @author Ruben Gees
@@ -32,6 +33,18 @@ object Utils {
         null
     }
 
+    fun getIpAddress(): String? = try {
+        NetworkInterface.getNetworkInterfaces().asSequence()
+            .flatMap { it.inetAddresses.asSequence() }
+            .filterNot { it.isLoopbackAddress || it.isLinkLocalAddress }
+            .map { it.hostAddress }
+            .firstOrNull()
+    } catch (error: Throwable) {
+        Timber.e("Error trying to get ip address", error)
+
+        null
+    }
+
     fun getNativeAppPackage(context: Context, url: HttpUrl): Set<String> {
         val browserActivityIntent = Intent(Intent.ACTION_VIEW, Uri.parse("http://www.generic.com"))
         val genericResolvedList = extractPackageNames(