Skip to content

Commit

Permalink
feat: align development to master (#1093)
Browse files Browse the repository at this point in the history
* Add the Parcelize plugin

* Hide the Block Explorer feature behind the new isBlockExplorerEnabled flag (#1056)

* Change log level in the BaseNodes class from "e" to "i"

* Check if CommonFragment is added to activity before disabling screen recording

* Fix the update in the background thread issue

* Update min. valid FFI version to 1.0.0-rc.5 (#1057)

* Update the app version to 0.25.3(289)

* Update the hardcoded list of NextNet base nodes

* Increase build number to 290
  • Loading branch information
igordanilcenko committed May 14, 2024
1 parent 649db12 commit 28dad13
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import org.apache.commons.io.IOUtils
import javax.inject.Inject
import javax.inject.Singleton

private const val REGEX_ONION_WITH_NAME = "(.+::[A-Za-z0-9 ]{64}::/onion3/[A-Za-z0-9]+:[\\d]+)"
private const val REGEX_IPV4_WITH_NAME = "(.+::[A-Za-z0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})"
private const val REGEX_ONION = "([A-Za-z0-9 ]{64}::/onion3/[A-Za-z0-9]+:[\\d]+)"
private const val REGEX_IPV4 = "([A-Za-z0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})"
private const val REGEX_ONION_WITH_NAME = "(.+::[A-Fa-f0-9 ]{64}::/onion3/[A-Fa-f0-9]+:[\\d]+)"
private const val REGEX_IPV4_WITH_NAME = "(.+::[A-Fa-f0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})"
private const val REGEX_ONION = "([A-Fa-f0-9 ]{64}::/onion3/[A-Fa-f0-9]+:[\\d]+)"
private const val REGEX_IPV4 = "([A-Fa-f0-9 ]{64}::/ip4/[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}/tcp/[0-9]{2,6})"

@Singleton
class BaseNodesManager @Inject constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ object DebugConfig {
private const val _useYatSandbox = false
val yatEnvironment = if (_useYatSandbox && isDebug()) YatEnvironment.SANDBOX else YatEnvironment.PRODUCTION

// Needed for testing resetting wallet on the network changed
private const val _mockNetwork = false
val mockNetwork = _mockNetwork && isDebug()

Expand Down

0 comments on commit 28dad13

Please sign in to comment.