Use react-native net-info community package

Signed-off-by: yenda <eric@status.im>

android/app/build.gradle

@@ -255,6 +255,7 @@ android {
 }
 
 dependencies {
+    implementation project(':@react-native-community_netinfo')
     implementation project(':react-native-background-timer')
     implementation project(':react-native-svg')
     implementation 'com.android.support:multidex:1.0.2'

android/app/src/main/java/im/status/ethereum/MainApplication.java

@@ -4,6 +4,7 @@ import android.support.multidex.MultiDexApplication;
 
 import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
 import com.facebook.react.ReactApplication;
+import com.reactnativecommunity.netinfo.NetInfoPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
@@ -54,6 +55,7 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
             Function<String, String> callRPC = statusPackage.getCallRPC();
             return Arrays.asList(
                     new MainReactPackage(),
+                    new NetInfoPackage(),
                     new RNMail(),
                     new RNFirebasePackage(),
                     new RNFirebaseMessagingPackage(),

android/settings.gradle

@@ -1,3 +1,10 @@
+pluginManagement {
+  repositories {
+      mavenLocal() // Let's prioritize local Maven repos so that Nix can provide them offline
+      gradlePluginPortal()
+  }
+}
+
 rootProject.name = 'StatusIm'
 include ':react-native-nfc-manager'
 project(':react-native-nfc-manager').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-nfc-manager/android')
@@ -50,3 +57,5 @@ include ':react-native-gesture-handler'
 project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 include ':react-native-screens'
 project(':react-native-screens').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-screens/android')
+include ':@react-native-community_netinfo'
+project(':@react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')

clj-rn.conf.edn

@@ -46,7 +46,8 @@
               "react-native-navigation-twopane"
               "hi-base32"
               "react-native-mail"
-              "react-native-shake"]
+              "react-native-shake"
+              "@react-native-community/netinfo"]
  ;; Desktop modules
  :desktop-modules ["realm"
                    "react-native-languages"

components/src/status_im/ui/components/react.cljs

@@ -34,7 +34,6 @@
 
 (def app-registry (get-react-property "AppRegistry"))
 (def app-state (get-react-property "AppState"))
-(def net-info (get-react-property "NetInfo"))
 (def view (get-class "View"))
 (def safe-area-view (get-class "SafeAreaView"))
 (def progress-bar (get-class "ProgressBarAndroid"))
@@ -218,6 +217,10 @@
          (.then images-fn)
          (.catch show-access-error)))))
 
+;; Net info
+
+(def net-info (.-default js-dependencies/net-info))
+
 ;; Clipboard
 
 (def sharing

ios/Podfile

@@ -25,6 +25,8 @@ target 'StatusIm' do
   # when removing svg pod, RCTImage is needed to be removed from React subspecs
   pod 'RNSVG', :path => '../node_modules/react-native-svg'
 
+  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
+
   target 'StatusImTests' do
     inherit! :search_paths
     # Pods for testing

mobile_files/package.json.orig

@@ -6,6 +6,7 @@
     "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "dependencies": {
+    "@react-native-community/netinfo": "3.2.1",
     "@tradle/react-native-http": "2.0.1",
     "assert": "1.4.1",
     "asyncstorage-down": "4.0.1",

mobile_files/yarn.lock

@@ -1062,6 +1062,11 @@
     xcode "^2.0.0"
     xmldoc "^0.4.0"
 
+"@react-native-community/netinfo@3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-3.2.1.tgz#cd073b81a4b978f7f55f1a960a0b56c462813e02"
+  integrity sha512-A2qANOnlRDVe+8kMbKMwy3/0bOlOA2+y8DyWg2Rv2KHICIfin+oxixbG0ewAOLQdLkSEyyumZXRmIVl7VI/KJg==
+
 "@react-navigation/core@~3.4.1":
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.4.2.tgz#bec563e94fde40fbab3730cdc97f22afbb2a1498"

nix/mobile/android/maven-and-npm-deps/maven/fetch-maven-deps.sh

@@ -12,17 +12,18 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 current_dir=$(cd "${BASH_SOURCE%/*}" && pwd)
 gradle_opts="--console plain"
 tmp_pom_filename=$(mktemp --tmpdir fetch-maven-deps-XXXX.pom)
+tmp_mvn_dep_tree_filename=$(mktemp --tmpdir mvn-dep-tree-XXXX.txt)
 deps_file_path=$(mktemp --tmpdir fetch-maven-deps-XXXX-deps.txt)
 
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
-mavenSources=(
+mavenSources=( \
   https://dl.google.com/dl/android/maven2 \
   https://jcenter.bintray.com \
+  https://plugins.gradle.org/m2 \
   https://repo.maven.apache.org/maven2 \
   https://maven.fabric.io/public \
   https://jitpack.io \
-  https://plugins.gradle.org/m2
 )
 mavenSourcesSedFilter=$(join_by '|' ${mavenSources[@]})
 
@@ -62,15 +63,17 @@ function tryGetPOMFromURL() {
   local url="$1"
 
   rm -f $tmp_pom_filename
-  curl --output $tmp_pom_filename --silent --fail "$url.pom" && test -s $tmp_pom_filename
+  curl --output $tmp_pom_filename --silent --fail --location "$url.pom" && test -s $tmp_pom_filename
 }
 
 # Given the components of a package ID, will loop through known repositories to figure out a source for the package
 function determineArtifactUrl() {
-  local tokens=("$@")
+  # Parse dependency ID into components (group ID, artifact ID, version)
+  IFS=':' read -ra tokens <<< "$1"
   local groupId=${tokens[0]}
+  [ -z "$groupId" ] && return
   local artifactId=${tokens[1]}
-  local version=${tokens[2]}
+  local version=$(echo "${tokens[2]}" | cut -d'@' -f1)
 
   local path=$(getPath "${tokens[@]}")
   for mavenSourceUrl in ${mavenSources[@]}; do
@@ -84,6 +87,7 @@ function determineArtifactUrl() {
       return
     fi
   done
+  echo "<NOTFOUND>"
 }
 
 # Executes a gradle dependencies command and returns the output package IDs
@@ -109,10 +113,14 @@ function retrieveAdditionalDependencies() {
   # the dependencies for each individual POM file. Instead of parsing the dependency tree itself though,
   # we look at what packages maven downloads from the internet into the local repo,
   # which avoids us having to do a deep search, and does not report duplicates
-  # tryGetPOMFromURL downloads the POM file into $tmp_pom_filename
-  local additional_deps=( $(mvn dependency:tree -B -Dmaven.repo.local=$mvn_tmp_repo -f "$1" 2>&1 \
+  echo -n > $tmp_mvn_dep_tree_filename
+  mvn dependency:tree -B -Dmaven.repo.local=$mvn_tmp_repo -f "$1" > $tmp_mvn_dep_tree_filename 2>&1 || echo -n
+  local additional_deps=( $(cat $tmp_mvn_dep_tree_filename \
     | grep -E 'Downloaded from [^:]+: [^ ]+\.(pom|jar|aar)' \
     | sed -E "s;^\[INFO\] Downloaded from [^:]+: ([^ ]+)\.(pom|jar|aar) .*$;\1;") )
+  local missing_additional_deps=( $(cat $tmp_mvn_dep_tree_filename \
+    | grep -E "The POM for .+:.+:(pom|jar):.+ is missing" \
+    | sed -E "s;^.*The POM for (.+:.+:(pom|jar):.+) is missing.*$;\1;") )
 
   for additional_dep_url in ${additional_deps[@]}; do
     local additional_dep_id=$(getPackageIdFromURL $additional_dep_url)
@@ -127,23 +135,50 @@ function retrieveAdditionalDependencies() {
     done
     [ $alreadyExists -eq 0 ] && echo "$additional_dep_url" || continue
   done
+
+  for additional_dep_id in ${missing_additional_deps[@]}; do
+    # See if we already have this dependency in $deps
+    local alreadyExists=0
+    for _dep in ${deps[@]}; do
+      if [ "$additional_dep_id" = "$_dep" ]; then
+        alreadyExists=1
+        break
+      fi
+    done
+
+    if [ $alreadyExists -eq 0 ]; then
+      artifactUrl=$(determineArtifactUrl $additional_dep_id)
+      if [ -z "$artifactUrl" ]; then
+        continue
+      elif [ "$artifactUrl" = "<NOTFOUND>" ]; then
+        # Some dependencies don't contain a normal format, so we ignore them (e.g. `com.squareup.okhttp:okhttp:{strictly`)
+        echo "Failed to determine source of $dep, ignoring..." > /dev/stderr
+        continue
+      fi
+
+      echo "$artifactUrl"
+    fi
+  done
 }
 
 mvn_tmp_repo=$(mktemp -d)
-trap "rm -rf $mvn_tmp_repo $tmp_pom_filename $deps_file_path" ERR EXIT HUP INT
+trap "rm -rf $mvn_tmp_repo $tmp_pom_filename $deps_file_path $tmp_mvn_dep_tree_filename" ERR EXIT HUP INT
 
 pushd $GIT_ROOT/android > /dev/null
 
-projects=$(gradle projects $gradle_opts 2>&1 \
-            | grep "Project ':" \
-            | sed -E "s;^.--- Project '(\:[a-zA-Z0-9\-]+)';\1;")
+gradleProjects=$(gradle projects $gradle_opts 2>&1 \
+                | grep "Project ':" \
+                | sed -E "s;^.--- Project '\:([@_a-zA-Z0-9\-]+)';\1;")
+projects=( ${gradleProjects[@]} )
+IFS=$'\n' sortedProjects=($(sort -u <<<"${projects[*]}"))
+unset IFS
 
 echo -n > $deps_file_path
 # TODO: try to limit unnecessary dependencies brought in by passing e.g. `--configuration releaseCompileClasspath` to the `gradle *:dependencies` command
 runGradleDepsCommand 'buildEnvironment' >> $deps_file_path
-for project in ${projects[@]}; do
-  runGradleDepsCommand "${project}:buildEnvironment" >> $deps_file_path
-  runGradleDepsCommand "${project}:dependencies" >> $deps_file_path
+for project in ${sortedProjects[@]}; do
+  runGradleDepsCommand ${project}:buildEnvironment >> $deps_file_path
+  runGradleDepsCommand ${project}:dependencies >> $deps_file_path
 done
 
 popd > /dev/null
@@ -174,15 +209,10 @@ for dep in ${deps[@]}; do
     continue
   fi
 
-  # Parse dependency ID into components (group ID, artifact ID, version)
-  IFS=':' read -ra tokens <<< "$dep"
-  groupId=${tokens[0]}
-  [ -z "$groupId" ] && continue
-  artifactId=${tokens[1]}
-  version=$(echo "${tokens[2]}" | cut -d'@' -f1)
-
-  artifactUrl=$(determineArtifactUrl $groupId $artifactId $version)
+  artifactUrl=$(determineArtifactUrl $dep)
   if [ -z "$artifactUrl" ]; then
+    continue
+  elif [ "$artifactUrl" = "<NOTFOUND>" ]; then
     # Some dependencies don't contain a normal format, so we ignore them (e.g. `com.squareup.okhttp:okhttp:{strictly`)
     echo "Failed to determine source of $dep, ignoring..." > /dev/stderr
     continue

nix/mobile/android/maven-and-npm-deps/maven/maven-inputs.txt

@@ -505,6 +505,11 @@ https://jcenter.bintray.com/com/android/tools/sdklib/24.3.1/sdklib-24.3.1
 https://jcenter.bintray.com/com/android/tools/sdklib/24.5.0/sdklib-24.5.0
 https://jcenter.bintray.com/com/android/tools/sdklib/25.2.0/sdklib-25.2.0
 https://jcenter.bintray.com/com/android/tools/sdklib/25.2.3/sdklib-25.2.3
+https://jcenter.bintray.com/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0
+https://jcenter.bintray.com/com/diffplug/durian/durian-core/1.2.0/durian-core-1.2.0
+https://jcenter.bintray.com/com/diffplug/durian/durian-io/1.2.0/durian-io-1.2.0
+https://jcenter.bintray.com/com/diffplug/spotless/spotless-lib-extra/1.23.0/spotless-lib-extra-1.23.0
+https://jcenter.bintray.com/com/diffplug/spotless/spotless-lib/1.23.0/spotless-lib-1.23.0
 https://jcenter.bintray.com/com/drewnoakes/metadata-extractor/2.9.1/metadata-extractor-2.9.1
 https://jcenter.bintray.com/com/facebook/conceal/conceal/1.1.3/conceal-1.1.3
 https://jcenter.bintray.com/com/facebook/fresco/animated-base/1.10.0/animated-base-1.10.0
@@ -522,11 +527,13 @@ https://jcenter.bintray.com/com/facebook/fresco/imagepipeline-okhttp3/1.10.0/ima
 https://jcenter.bintray.com/com/facebook/fresco/imagepipeline/0.8.1/imagepipeline-0.8.1
 https://jcenter.bintray.com/com/facebook/fresco/imagepipeline/1.10.0/imagepipeline-1.10.0
 https://jcenter.bintray.com/com/facebook/infer/annotation/infer-annotation/0.11.2/infer-annotation-0.11.2
+https://jcenter.bintray.com/com/facebook/infer/annotation/infer-annotation/0.17.0/infer-annotation-0.17.0
 https://jcenter.bintray.com/com/facebook/react/react-native/0.20.1/react-native-0.20.1
 https://jcenter.bintray.com/com/facebook/soloader/soloader/0.6.0/soloader-0.6.0
 https://jcenter.bintray.com/com/facebook/stetho/stetho-okhttp/1.2.0/stetho-okhttp-1.2.0
 https://jcenter.bintray.com/com/facebook/stetho/stetho/1.2.0/stetho-1.2.0
 https://jcenter.bintray.com/com/fasterxml/jackson/core/jackson-core/2.2.3/jackson-core-2.2.3
+https://jcenter.bintray.com/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/1.0/accessibility-test-framework-1.0
 https://jcenter.bintray.com/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2
 https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9
 https://jcenter.bintray.com/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0
@@ -555,10 +562,13 @@ https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.0.0/protobuf-jav
 https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.4.0/protobuf-java-3.4.0
 https://jcenter.bintray.com/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1
 https://jcenter.bintray.com/com/google/zxing/core/3.3.0/core-3.3.0
+https://jcenter.bintray.com/com/googlecode/concurrent-trees/concurrent-trees/2.6.1/concurrent-trees-2.6.1
+https://jcenter.bintray.com/com/googlecode/javaewah/JavaEWAH/1.1.6/JavaEWAH-1.1.6
 https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1
 https://jcenter.bintray.com/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3
 https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1
 https://jcenter.bintray.com/com/intellij/annotations/12.0/annotations-12.0
+https://jcenter.bintray.com/com/jcraft/jsch/0.1.54/jsch-0.1.54
 https://jcenter.bintray.com/com/nineoldandroids/library/2.4.0/library-2.4.0
 https://jcenter.bintray.com/com/parse/bolts/bolts-android/1.1.4/bolts-android-1.1.4
 https://jcenter.bintray.com/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0
@@ -652,6 +662,8 @@ https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-
 https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46
 https://jcenter.bintray.com/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2
 https://jcenter.bintray.com/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15
+https://jcenter.bintray.com/org/codehaus/groovy/groovy-xml/2.4.7/groovy-xml-2.4.7
+https://jcenter.bintray.com/org/codehaus/groovy/groovy/2.4.7/groovy-2.4.7
 https://jcenter.bintray.com/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14
 https://jcenter.bintray.com/org/easytesting/fest-assert-core/2.0M10/fest-assert-core-2.0M10
 https://jcenter.bintray.com/org/easytesting/fest-util/1.2.5/fest-util-1.2.5
@@ -659,6 +671,7 @@ https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2
 https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4
 https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.5.1/ecj-4.5.1
 https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1
+https://jcenter.bintray.com/org/eclipse/jgit/org.eclipse.jgit/4.9.0.201710071750-r/org.eclipse.jgit-4.9.0.201710071750-r
 https://jcenter.bintray.com/org/glassfish/jaxb/jaxb-core/2.2.11/jaxb-core-2.2.11
 https://jcenter.bintray.com/org/glassfish/jaxb/jaxb-runtime/2.2.11/jaxb-runtime-2.2.11
 https://jcenter.bintray.com/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11
@@ -670,25 +683,11 @@ https://jcenter.bintray.com/org/jacoco/org.jacoco.report/0.7.5.201505241946/org.
 https://jcenter.bintray.com/org/javassist/javassist/3.19.0-GA/javassist-3.19.0-GA
 https://jcenter.bintray.com/org/jdom/jdom2/2.0.6/jdom2-2.0.6
 https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/1.3.11/kotlin-android-extensions-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.3.11/kotlin-annotation-processing-gradle-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-build-common/1.3.11/kotlin-build-common-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.3.11/kotlin-compiler-embeddable-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-runner/1.3.11/kotlin-compiler-runner-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-daemon-client/1.3.11/kotlin-daemon-client-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.3.11/kotlin-gradle-plugin-api-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.3.11/kotlin-gradle-plugin-model-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.3.11/kotlin-gradle-plugin-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-native-utils/1.3.11/kotlin-native-utils-1.3.11
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.2.0/kotlin-reflect-1.2.0
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.11/kotlin-reflect-1.3.11
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.20/kotlin-reflect-1.3.20
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-reflect/1.3.31/kotlin-reflect-1.3.31
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-script-runtime/1.3.11/kotlin-script-runtime-1.3.11
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.3.11/kotlin-scripting-compiler-embeddable-1.3.11
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.2.71/kotlin-stdlib-common-1.2.71
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.11/kotlin-stdlib-common-1.3.11
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20/kotlin-stdlib-common-1.3.20
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71
@@ -703,7 +702,6 @@ https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-st
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/kotlin-stdlib-1.2.0
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.2.71/kotlin-stdlib-1.2.71
-https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.11/kotlin-stdlib-1.3.11
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.20/kotlin-stdlib-1.3.20
 https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31
 https://jcenter.bintray.com/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824
@@ -749,6 +747,7 @@ https://jcenter.bintray.com/org/robolectric/robolectric-resources/3.0/robolectri
 https://jcenter.bintray.com/org/robolectric/robolectric-utils/3.0/robolectric-utils-3.0
 https://jcenter.bintray.com/org/robolectric/robolectric/3.0/robolectric-3.0
 https://jcenter.bintray.com/org/robolectric/shadows-core/3.0/shadows-core-3.0
+https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2
 https://jcenter.bintray.com/org/webkit/android-jsc/r174650/android-jsc-r174650
 https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1
 https://jcenter.bintray.com/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c
@@ -761,6 +760,8 @@ https://maven.java.net/content/repositories/releases/org/glassfish/hk2/hk2-publi
 https://maven.java.net/content/repositories/releases/org/glassfish/hk2/osgiversion-maven-plugin/2.1.14/osgiversion-maven-plugin-2.1.14
 https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.13-SNAPSHOT/junit-4.13-20190621.062355-185
 https://oss.sonatype.org/content/repositories/snapshots/junit/junit/5.0-SNAPSHOT/junit-5.0-20150111.191949-1
+https://plugins.gradle.org/m2/com/diffplug/gradle/spotless/com.diffplug.gradle.spotless.gradle.plugin/3.23.0/com.diffplug.gradle.spotless.gradle.plugin-3.23.0
+https://plugins.gradle.org/m2/com/diffplug/spotless/spotless-plugin-gradle/3.23.0/spotless-plugin-gradle-3.23.0
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.2/antlr-2.7.2
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7
 https://repo.maven.apache.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0
@@ -775,7 +776,9 @@ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/3.0.0/biz.aQ
 https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/3.2.0/biz.aQute.bndlib-3.2.0
 https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/4.2.0/biz.aQute.bndlib-4.2.0
 https://repo.maven.apache.org/maven2/biz/aQute/bnd/bnd-maven-plugin/3.1.0/bnd-maven-plugin-3.1.0
+https://repo.maven.apache.org/maven2/biz/aQute/bnd/bnd-maven-plugin/3.2.0/bnd-maven-plugin-3.2.0
 https://repo.maven.apache.org/maven2/biz/aQute/bnd/bnd-plugin-parent/3.1.0/bnd-plugin-parent-3.1.0
+https://repo.maven.apache.org/maven2/biz/aQute/bnd/bnd-plugin-parent/3.2.0/bnd-plugin-parent-3.2.0
 https://repo.maven.apache.org/maven2/biz/aQute/bnd/bndlib/2.1.0/bndlib-2.1.0
 https://repo.maven.apache.org/maven2/biz/aQute/bnd/bndlib/2.3.0/bndlib-2.3.0
 https://repo.maven.apache.org/maven2/biz/aQute/bnd/parent/2.1.0/parent-2.1.0
@@ -808,7 +811,6 @@ https://repo.maven.apache.org/maven2/com/esotericsoftware/kryo/kryo/2.20/kryo-2.
 https://repo.maven.apache.org/maven2/com/esotericsoftware/minlog/minlog/1.2/minlog-1.2
 https://repo.maven.apache.org/maven2/com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07
 https://repo.maven.apache.org/maven2/com/esotericsoftware/reflectasm/reflectasm/1.07/reflectasm-1.07-shaded
-https://repo.maven.apache.org/maven2/com/facebook/infer/annotation/infer-annotation/0.17.0/infer-annotation-0.17.0
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/10/oss-parent-10
 https://repo.maven.apache.org/maven2/com/github/axet/litedb/libsqlite/0.282-3/libsqlite-0.282-3
 https://repo.maven.apache.org/maven2/com/github/axet/litedb/libsqlite/0.282-3/libsqlite-0.282-3-natives-linux-x86
@@ -822,12 +824,13 @@ https://repo.maven.apache.org/maven2/com/github/hazendaz/base-parent/20/base-par
 https://repo.maven.apache.org/maven2/com/github/marschall/memoryfilesystem/0.6.4/memoryfilesystem-0.6.4
 https://repo.maven.apache.org/maven2/com/github/rtyley/android-screenshot-paparazzo/1.8/android-screenshot-paparazzo-1.8
 https://repo.maven.apache.org/maven2/com/github/rtyley/android-screenshot-parent/1.8/android-screenshot-parent-1.8
+https://repo.maven.apache.org/maven2/com/github/siom79/japicmp/japicmp-base/0.10.0/japicmp-base-0.10.0
+https://repo.maven.apache.org/maven2/com/github/siom79/japicmp/japicmp-maven-plugin/0.10.0/japicmp-maven-plugin-0.10.0
 https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs-maven-plugin/3.1.11/spotbugs-maven-plugin-3.1.11
 https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs-maven-plugin/3.1.3/spotbugs-maven-plugin-3.1.3
 https://repo.maven.apache.org/maven2/com/github/wvengen/proguard-maven-plugin/2.0.13/proguard-maven-plugin-2.0.13
 https://repo.maven.apache.org/maven2/com/google/android/android/4.0.1.2/android-4.0.1.2
 https://repo.maven.apache.org/maven2/com/google/android/android/4.1.1.4/android-4.1.1.4
-https://repo.maven.apache.org/maven2/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/1.0/accessibility-test-framework-1.0
 https://repo.maven.apache.org/maven2/com/google/auto/auto-common/0.3/auto-common-0.3
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/2/auto-parent-2
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/3/auto-parent-3
@@ -835,6 +838,7 @@ https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/6/auto-parent-6
 https://repo.maven.apache.org/maven2/com/google/auto/service/auto-service/1.0-rc2/auto-service-1.0-rc2
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2
+https://repo.maven.apache.org/maven2/com/google/code/findbugs/annotations/3.0.0/annotations-3.0.0
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/findbugs-annotations/3.0.1/findbugs-annotations-3.0.1
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.7/gson-parent-2.7
@@ -888,6 +892,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/25.1-android/guava-2
 https://repo.maven.apache.org/maven2/com/google/inject/guice-parent/4.0/guice-parent-4.0
 https://repo.maven.apache.org/maven2/com/google/inject/guice/4.0/guice-4.0
 https://repo.maven.apache.org/maven2/com/google/inject/guice/4.0/guice-4.0-no_aop
+https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/0.1/j2objc-annotations-0.1
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs-parent/1.0/jimfs-parent-1.0
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-1.1
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs/1.0/jimfs-1.0
@@ -933,8 +938,10 @@ https://repo.maven.apache.org/maven2/com/jcraft/jsch.agentproxy.sshagent/0.0.6/j
 https://repo.maven.apache.org/maven2/com/jcraft/jsch.agentproxy.usocket-jna/0.0.6/jsch.agentproxy.usocket-jna-0.0.6
 https://repo.maven.apache.org/maven2/com/jcraft/jsch.agentproxy.usocket-nc/0.0.6/jsch.agentproxy.usocket-nc-0.0.6
 https://repo.maven.apache.org/maven2/com/jcraft/jsch.agentproxy/0.0.6/jsch.agentproxy-0.0.6
+https://repo.maven.apache.org/maven2/com/jcraft/jsch/0.1.44-1/jsch-0.1.44-1
 https://repo.maven.apache.org/maven2/com/jcraft/jsch/0.1.49/jsch-0.1.49
 https://repo.maven.apache.org/maven2/com/jcraft/jsch/0.1.50/jsch-0.1.50
+https://repo.maven.apache.org/maven2/com/jcraft/jzlib/1.0.7/jzlib-1.0.7
 https://repo.maven.apache.org/maven2/com/keyboardsamurais/maven/maven-timestamp-plugin/1.0/maven-timestamp-plugin-1.0
 https://repo.maven.apache.org/maven2/com/kohlschutter/junixsocket/junixsocket-common/2.0.4/junixsocket-common-2.0.4
 https://repo.maven.apache.org/maven2/com/kohlschutter/junixsocket/junixsocket-native-common/2.0.4/junixsocket-native-common-2.0.4
@@ -987,8 +994,10 @@ https://repo.maven.apache.org/maven2/com/thoughtworks/qdox/qdox/1.12.1/qdox-1.12
 https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream-parent/1.4.10/xstream-parent-1.4.10
 https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream-parent/1.4.2/xstream-parent-1.4.2
 https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream-parent/1.4.5/xstream-parent-1.4.5
+https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream-parent/1.4.7/xstream-parent-1.4.7
 https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream/1.4.10/xstream-1.4.10
 https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream/1.4.5/xstream-1.4.5
+https://repo.maven.apache.org/maven2/com/thoughtworks/xstream/xstream/1.4.7/xstream-1.4.7
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.4.1/antlr4-master-4.4.1
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.5/antlr4-master-4.5
 https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-maven-plugin/4.4.1/antlr4-maven-plugin-4.4.1
@@ -1026,6 +1035,7 @@ https://repo.maven.apache.org/maven2/commons-logging/commons-logging-api/1.1/com
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0/commons-logging-1.0
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1
 https://repo.maven.apache.org/maven2/commons-validator/commons-validator/1.1.4/commons-validator-1.1.4
 https://repo.maven.apache.org/maven2/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0
@@ -1164,6 +1174,7 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-build-plugin/1.1
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-build-plugin/1.10/commons-build-plugin-1.10
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-build-plugin/1.3/commons-build-plugin-1.3
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-build-plugin/1.4/commons-build-plugin-1.4
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.11/commons-compress-1.11
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.16.1/commons-compress-1.16.1
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.5/commons-compress-1.5
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.9/commons-compress-1.9
@@ -1211,7 +1222,7 @@ https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/3.0.1/
 https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/3.2.0/maven-bundle-plugin-3.2.0
 https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/3.5.0/maven-bundle-plugin-3.5.0
 https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/4.1.0/maven-bundle-plugin-4.1.0
-https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/4.2.0/maven-bundle-plugin-4.2.0
+https://repo.maven.apache.org/maven2/org/apache/felix/maven-bundle-plugin/4.2.1/maven-bundle-plugin-4.2.1
 https://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.6.2/org.apache.felix.bundlerepository-1.6.2
 https://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6
 https://repo.maven.apache.org/maven2/org/apache/felix/org.apache.felix.utils/1.6.0/org.apache.felix.utils-1.6.0
@@ -1223,6 +1234,7 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.3/
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.2/httpclient-4.2.2
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.5/httpclient-4.2.5
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.3.5/httpclient-4.3.5
+https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.0.1/httpcomponents-client-4.0.1
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.0.2/httpcomponents-client-4.0.2
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.1.1/httpcomponents-client-4.1.1
@@ -1232,6 +1244,7 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-cl
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.2.5/httpcomponents-client-4.2.5
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.2.6/httpcomponents-client-4.2.6
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.3.5/httpcomponents-client-4.3.5
+https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.3.6/httpcomponents-client-4.3.6
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.2/httpcomponents-client-4.5.2
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-client/4.5.6/httpcomponents-client-4.5.6
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.0.1/httpcomponents-core-4.0.1
@@ -1241,6 +1254,7 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-co
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.2.4/httpcomponents-core-4.2.4
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.2.5/httpcomponents-core-4.2.5
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.3.2/httpcomponents-core-4.3.2
+https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.3.3/httpcomponents-core-4.3.3
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.10/httpcomponents-core-4.4.10
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.4/httpcomponents-core-4.4.4
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponents-core/4.4.5/httpcomponents-core-4.4.5
@@ -1250,6 +1264,7 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.1.4/ht
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.2.4/httpcore-4.2.4
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2
+https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpmime/4.2.5/httpmime-4.2.5
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/maven-notice-plugin/0.0.2/maven-notice-plugin-0.0.2
@@ -1554,6 +1569,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-p
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/2.4/maven-dependency-plugin-2.4
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/2.8/maven-dependency-plugin-2.8
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/2.9/maven-dependency-plugin-2.9
+https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.0.0/maven-dependency-plugin-3.0.0
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin/3.1.1/maven-dependency-plugin-3.1.1
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-deploy-plugin/2.5/maven-deploy-plugin-2.5
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-deploy-plugin/2.7/maven-deploy-plugin-2.7
@@ -1663,6 +1679,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-scm-publish-
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/1.4/maven-shade-plugin-1.4
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/2.0/maven-shade-plugin-2.0
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/2.3/maven-shade-plugin-2.3
+https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/3.0.0/maven-shade-plugin-3.0.0
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-shade-plugin/3.1.0/maven-shade-plugin-3.1.0
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-5/maven-site-plugin-2.0-beta-5
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-site-plugin/2.1.1/maven-site-plugin-2.1.1
@@ -1694,6 +1711,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plu
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.19.1/maven-surefire-plugin-2.19.1
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.19/maven-surefire-plugin-2.19
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.20.1/maven-surefire-plugin-2.20.1
+https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.20/maven-surefire-plugin-2.20
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.21.0/maven-surefire-plugin-2.21.0
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.3/maven-surefire-plugin-2.3
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3
@@ -1701,6 +1719,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plu
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.7.2/maven-surefire-plugin-2.7.2
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/2.9/maven-surefire-plugin-2.9
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/3.0.0-M3/maven-surefire-plugin-3.0.0-M3
+https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-report-plugin/2.20/maven-surefire-report-plugin-2.20
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-report-plugin/3.0.0-M3/maven-surefire-report-plugin-3.0.0-M3
 https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-war-plugin/3.0.0/maven-war-plugin-3.0.0
 https://repo.maven.apache.org/maven2/org/apache/maven/release/maven-release/2.0/maven-release-2.0
@@ -1776,10 +1795,12 @@ https://repo.maven.apache.org/maven2/org/apache/maven/scm/maven-scm/1.9.5/maven-
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/file-management/1.1/file-management-1.1
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/file-management/1.2.1/file-management-1.2.1
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/file-management/3.0.0/file-management-3.0.0
+https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.9.0/maven-artifact-transfer-0.9.0
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-artifact-transfer/0.9.1/maven-artifact-transfer-0.9.1
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/1.2/maven-common-artifact-filters-1.2
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/1.4/maven-common-artifact-filters-1.4
+https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.0.0/maven-common-artifact-filters-3.0.0
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-common-artifact-filters/3.0.1/maven-common-artifact-filters-3.0.1
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.1/maven-dependency-analyzer-1.1
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-analyzer/1.10/maven-dependency-analyzer-1.10
@@ -1791,6 +1812,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tr
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/2.1/maven-dependency-tree-2.1
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/2.2/maven-dependency-tree-2.2
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.0.1/maven-dependency-tree-3.0.1
+https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-dependency-tree/3.0/maven-dependency-tree-3.0
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-doxia-tools/1.0.2/maven-doxia-tools-1.0.2
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-invoker/2.0.11/maven-invoker-2.0.11
 https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-invoker/2.0.7/maven-invoker-2.0.7
@@ -1833,6 +1855,7 @@ https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.18.1/s
 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.19.1/surefire-2.19.1
 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.19/surefire-2.19
 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.20.1/surefire-2.20.1
+https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.20/surefire-2.20
 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.21.0/surefire-2.21.0
 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.3/surefire-2.3
 https://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire/2.4.3/surefire-2.4.3
@@ -1844,26 +1867,33 @@ https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-file/1.0-beta-
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-6/wagon-http-lightweight-1.0-beta-6
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-6/wagon-http-shared-1.0-beta-6
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-shared/2.7/wagon-http-shared-2.7
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/2.0/wagon-provider-api-2.0
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/2.10/wagon-provider-api-2.10
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/2.7/wagon-provider-api-2.7
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/1.0-beta-6/wagon-providers-1.0-beta-6
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/2.0/wagon-providers-2.0
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/2.10/wagon-providers-2.10
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/2.7/wagon-providers-2.7
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-6/wagon-ssh-common-1.0-beta-6
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh-common/2.0/wagon-ssh-common-2.0
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh-common/2.10/wagon-ssh-common-2.10
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh-common/2.7/wagon-ssh-common-2.7
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh-external/1.0-alpha-5/wagon-ssh-external-1.0-alpha-5
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-6/wagon-ssh-external-1.0-beta-6
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh-external/2.10/wagon-ssh-external-2.10
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh/2.0/wagon-ssh-2.0
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-ssh/2.7/wagon-ssh-2.7
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-webdav-jackrabbit/2.7/wagon-webdav-jackrabbit-2.7
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-webdav/1.0-beta-2/wagon-webdav-1.0-beta-2
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/2.0/wagon-2.0
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/2.10/wagon-2.10
 https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/2.7/wagon-2.7
 https://repo.maven.apache.org/maven2/org/apache/rat/apache-rat-plugin/0.10/apache-rat-plugin-0.10
@@ -1922,6 +1952,7 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plug
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.16/animal-sniffer-maven-plugin-1.16
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.17/animal-sniffer-maven-plugin-1.17
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.8/animal-sniffer-maven-plugin-1.8
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-maven-plugin/1.9/animal-sniffer-maven-plugin-1.9
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.10/animal-sniffer-parent-1.10
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.11/animal-sniffer-parent-1.11
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.13/animal-sniffer-parent-1.13
@@ -1930,6 +1961,7 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.1
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.16/animal-sniffer-parent-1.16
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.17/animal-sniffer-parent-1.17
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.8/animal-sniffer-parent-1.8
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.9/animal-sniffer-parent-1.9
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/build-helper-maven-plugin/1.0/build-helper-maven-plugin-1.0
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/build-helper-maven-plugin/1.10/build-helper-maven-plugin-1.10
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/build-helper-maven-plugin/1.3/build-helper-maven-plugin-1.3
@@ -1981,6 +2013,7 @@ https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.3/ple
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.4.4/plexus-archiver-2.4.4
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.8.1/plexus-archiver-2.8.1
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/2.9/plexus-archiver-2.9
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.4/plexus-archiver-3.4
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-archiver/3.6.0/plexus-archiver-3.6.0
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9
@@ -2040,6 +2073,7 @@ https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.0.9/plexus-
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.0/plexus-io-2.0
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.3.2/plexus-io-2.3.2
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.4/plexus-io-2.4
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/2.7.1/plexus-io-2.7.1
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.0.0/plexus-io-3.0.0
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-io/3.0.1/plexus-io-3.0.1
 https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4
@@ -2122,11 +2156,14 @@ https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-parent/14/jetty-par
 https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-parent/20/jetty-parent-20
 https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-project/8.1.16.v20140903/jetty-project-8.1.16.v20140903
 https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-server/8.1.16.v20140903/jetty-server-8.1.16.v20140903
+https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/4.9.0.201710071750-r/org.eclipse.jgit-parent-4.9.0.201710071750-r
 https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.2/org.eclipse.sisu.inject-0.3.2
 https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.2/org.eclipse.sisu.plexus-0.3.2
 https://repo.maven.apache.org/maven2/org/eclipse/sisu/sisu-inject/0.3.2/sisu-inject-0.3.2
 https://repo.maven.apache.org/maven2/org/eclipse/sisu/sisu-plexus/0.3.2/sisu-plexus-0.3.2
+https://repo.maven.apache.org/maven2/org/eluder/coveralls/coveralls-maven-plugin/3.1.0/coveralls-maven-plugin-3.1.0
 https://repo.maven.apache.org/maven2/org/eluder/coveralls/coveralls-maven-plugin/4.1.0/coveralls-maven-plugin-4.1.0
+https://repo.maven.apache.org/maven2/org/eluder/eluder-parent/6/eluder-parent-6
 https://repo.maven.apache.org/maven2/org/eluder/eluder-parent/7/eluder-parent-7
 https://repo.maven.apache.org/maven2/org/fusesource/fusesource-pom/1.8/fusesource-pom-1.8
 https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-project/1.11/jansi-project-1.11
@@ -2144,8 +2181,11 @@ https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.1/hamcrest-2.1
 https://repo.maven.apache.org/maven2/org/immutables/tools/maven-shade-plugin/4/maven-shade-plugin-4
 https://repo.maven.apache.org/maven2/org/infinitest/continuous-testing-toolkit/1.0/continuous-testing-toolkit-1.0
 https://repo.maven.apache.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4
+https://repo.maven.apache.org/maven2/org/jacoco/jacoco-maven-plugin/0.7.2.201409121644/jacoco-maven-plugin-0.7.2.201409121644
 https://repo.maven.apache.org/maven2/org/jacoco/jacoco-maven-plugin/0.7.4.201502262128/jacoco-maven-plugin-0.7.4.201502262128
+https://repo.maven.apache.org/maven2/org/jacoco/jacoco-maven-plugin/0.7.9/jacoco-maven-plugin-0.7.9
 https://repo.maven.apache.org/maven2/org/jacoco/jacoco-maven-plugin/0.8.1/jacoco-maven-plugin-0.8.1
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.2.201409121644/org.jacoco.build-0.7.2.201409121644
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.5.201505241946/org.jacoco.build-0.7.5.201505241946
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.9/org.jacoco.build-0.7.9
@@ -2160,25 +2200,21 @@ https://repo.maven.apache.org/maven2/org/jdom/jdom/1.1/jdom-1.1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.0/kotlin-stdlib-common-1.3.0
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.0/kotlin-stdlib-1.3.0
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-annotations-common/1.2.71/kotlin-test-annotations-common-1.2.71
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-annotations-common/1.3.11/kotlin-test-annotations-common-1.3.11
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-annotations-common/1.3.20/kotlin-test-annotations-common-1.3.20
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-annotations-common/1.3.31/kotlin-test-annotations-common-1.3.31
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-common/1.2.71/kotlin-test-common-1.2.71
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-common/1.3.11/kotlin-test-common-1.3.11
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-common/1.3.20/kotlin-test-common-1.3.20
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-common/1.3.31/kotlin-test-common-1.3.31
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-junit/1.1.3-2/kotlin-test-junit-1.1.3-2
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-junit/1.2.0/kotlin-test-junit-1.2.0
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-junit/1.2.20/kotlin-test-junit-1.2.20
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-junit/1.2.71/kotlin-test-junit-1.2.71
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-junit/1.3.11/kotlin-test-junit-1.3.11
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-junit/1.3.20/kotlin-test-junit-1.3.20
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-junit/1.3.31/kotlin-test-junit-1.3.31
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.1.3-2/kotlin-test-1.1.3-2
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.2.0/kotlin-test-1.2.0
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.2.20/kotlin-test-1.2.20
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.2.71/kotlin-test-1.2.71
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.3.11/kotlin-test-1.3.11
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.3.20/kotlin-test-1.3.20
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.3.31/kotlin-test-1.3.31
 https://repo.maven.apache.org/maven2/org/json/json/20080701/json-20080701
@@ -2306,6 +2342,7 @@ https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.6.4/slf4j-parent-1.6.4
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.10/slf4j-parent-1.7.10
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.19/slf4j-parent-1.7.19
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.2/slf4j-parent-1.7.2
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.25
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.5/slf4j-parent-1.7.5
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.7/slf4j-parent-1.7.7
@@ -2356,6 +2393,7 @@ https://repo.maven.apache.org/maven2/org/sonatype/nexus/plugins/nexus-plugins/2.
 https://repo.maven.apache.org/maven2/org/sonatype/nexus/plugins/nexus-restlet1x-model/2.7.2-01/nexus-restlet1x-model-2.7.2-01
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/3/oss-parent-3
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4
+https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/6/oss-parent-6
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9

nix/mobile/android/targets/release-android.nix

@@ -68,13 +68,9 @@ in stdenv.mkDerivation {
     # Copy node_modules/ directory
     cp -a --no-preserve=ownership ${sourceProjectDir}/node_modules/ $sourceRoot/
     # Make android/build directories writable under node_modules
-    chmod -R u+w $sourceRoot/node_modules/react-native/
-    for d in `ls $sourceRoot/node_modules/react-native-*/android/build -d1`; do
+    for d in `find $sourceRoot/node_modules -type f -name build.gradle | xargs dirname`; do
       chmod -R u+w $d
     done
-    for d in `ls $sourceRoot/node_modules/react-native-*/android -d1`; do
-      chmod u+w $d
-    done
     chmod u+w $sourceRoot/node_modules/realm/android
   '';
   patchPhase = ''

nix/tools/maven/maven-inputs2nix.sh

@@ -70,14 +70,14 @@ function writeEntry() {
   fi
   deppath="${depurl/$prefix\//}"
   pom_sha256=$(getSHA "$depurl.pom")
-  [ -n "$pom_sha256" ] && pom_sha1=$(curl -s "$depurl.pom.sha1") || unset pom_sha1
+  [ -n "$pom_sha256" ] && pom_sha1=$(curl -s --location "$depurl.pom.sha1") || unset pom_sha1
   jar_sha256=$(getSHA "$depurl.jar")
   type='jar'
   if [ -z "$jar_sha256" ]; then
     jar_sha256=$(getSHA "$depurl.aar")
     [ -n "$jar_sha256" ] && type='aar'
   fi
-  [ -n "$jar_sha256" ] && jar_sha1=$(curl -s "$depurl.${type}.sha1") || unset jar_sha1
+  [ -n "$jar_sha256" ] && jar_sha1=$(curl -s --location "$depurl.${type}.sha1") || unset jar_sha1
 
   if [ -z "$pom_sha256" ] && [ -z "$jar_sha256" ] && [ -z "$aar_sha256" ]; then
     echo "Warning: failed to download $depurl" > /dev/stderr

react-native/src/mobile/status_im/react_native/js_dependencies.cljs

@@ -36,6 +36,7 @@
 (def react-native-navigation-twopane  (js/require "react-native-navigation-twopane"))
 (def react-native-shake     (js/require "react-native-shake"))
 (def react-native-screens   (js/require "react-native-screens"))
+(def net-info               (js/require "@react-native-community/netinfo"))
 (def mail-class             (js/require  "react-native-mail"))
 (def react-native-mail      (.-default mail-class))
 (def desktop-linking        #js {:addEventListener (fn [])})

src/status_im/init/core.cljs

@@ -4,6 +4,7 @@
             [status-im.data-store.core :as data-store]
             [status-im.multiaccounts.login.core :as multiaccounts.login]
             [status-im.native-module.core :as status]
+            [status-im.network.net-info :as network]
             [status-im.notifications.core :as notifications]
             [status-im.react-native.js-dependencies :as rn-dependencies]
             [status-im.ui.screens.db :refer [app-db]]
@@ -83,8 +84,7 @@
              ::data-store/init-store nil
              :ui/listen-to-window-dimensions-change nil
              :notifications/init                    nil
-             :network/listen-to-network-status      nil
-             :network/listen-to-connection-status   nil
+             ::network/listen-to-network-info       nil
              :hardwallet/register-card-events       nil
              :hardwallet/check-nfc-support nil
              :hardwallet/check-nfc-enabled nil}

src/status_im/native_module/core.cljs

@@ -99,8 +99,8 @@
 (defn close-application []
   (native-module/close-application))
 
-(defn connection-change [data]
-  (native-module/connection-change data))
+(defn connection-change [type expensive?]
+  (native-module/connection-change type expensive?))
 
 (defn app-state-change [state]
   (native-module/app-state-change state))

src/status_im/native_module/impl/module.cljs

@@ -168,8 +168,8 @@
 (defn close-application []
   (.closeApplication (status)))
 
-(defn connection-change [{:keys [type expensive?]}]
-  (.connectionChange (status) type expensive?))
+(defn connection-change [type expensive?]
+  (.connectionChange (status) type (boolean expensive?)))
 
 (defn app-state-change [state]
   (.appStateChange (status) state))

src/status_im/network/net_info.cljs

@@ -10,80 +10,44 @@
             [status-im.native-module.core :as status]
             [status-im.ui.screens.mobile-network-settings.events :as mobile-network]))
 
-(defn is-connected? [callback]
-  (when react-components/net-info
-    (.then (.fetch (.-isConnected react-components/net-info))
-           (fn [is-connected?]
-             (log/debug "Is connected?" is-connected?)
-             (callback is-connected?)))))
-
-(defn- wrap-net-info [callback]
-  (fn [info-js]
-    (let [info       (js->clj info-js :keywordize-keys true)
-          on-success #(callback {:type (:type info) :expensive? %})]
-      (if platform/ios?
-        (on-success false)
-        (.. react-components/net-info
-            isConnectionExpensive
-            (then on-success)
-            (catch (fn [error] (log/warn "isConnectionExpensive: " error))))))))
-
-(defn net-info [callback]
-  (when react-components/net-info
-    (.then (.getConnectionInfo react-components/net-info)
-           (wrap-net-info callback))))
-
-(defn add-connection-listener [listener]
-  (when react-components/net-info
-    (.addEventListener (.-isConnected react-components/net-info) "connectionChange" listener)))
-
-(defn add-net-info-listener [listener]
-  (when react-components/net-info
-    (.addEventListener react-components/net-info "connectionChange"
-                       (wrap-net-info listener))))
-
-(re-frame/reg-fx
- :network/listen-to-network-status
- (fn []
-   (let [callback-event #(re-frame/dispatch [:network/network-status-changed %])]
-     (net-info callback-event)
-     (add-net-info-listener callback-event))))
-
-(re-frame/reg-fx
- :network/listen-to-connection-status
- (fn []
-   (let [callback-event #(re-frame/dispatch [:network/connection-status-changed %])]
-     (is-connected? callback-event)
-     (add-connection-listener callback-event))))
-
-(fx/defn handle-connection-status-change
+(fx/defn change-network-status
   [{:keys [db] :as cofx} is-connected?]
   (fx/merge cofx
             {:db (assoc db :network-status (if is-connected? :online :offline))}
             (mailserver/network-connection-status-changed is-connected?)))
 
-(handlers/register-handler-fx
- :network/connection-status-changed
- (fn [{db :db :as cofx} [_ is-connected?]]
-   (handle-connection-status-change cofx is-connected?)))
+(fx/defn change-network-type
+  [{:keys [db] :as cofx} old-network-type network-type expensive?]
+  (fx/merge cofx
+            {:db (assoc db :network/type network-type)
+             :network/notify-status-go [network-type expensive?]}
+            (when (= "none" old-network-type)
+              (chaos-mode/check-chaos-mode))
+            (mobile-network/on-network-status-change)))
 
-(fx/defn handle-network-status-change
-  [{:keys [db] :as cofx} {:keys [type] :as data}]
-  (let [old-network-type (:network/type db)]
-    (fx/merge
-     cofx
-     {:db                       (assoc db :network/type type)
-      :network/notify-status-go data}
-     (when (= "none" old-network-type)
-       (chaos-mode/check-chaos-mode))
-     (mobile-network/on-network-status-change))))
+(fx/defn handle-network-info-change
+  {:events [::network-info-changed]}
+  [{:keys [db] :as cofx} {:keys [is-connected type details] :as state}]
+  (let [old-network-status (:network-status db)
+        old-network-type (:network/type db)]
+    (fx/merge cofx
+              (when-not (= is-connected old-network-status)
+                (change-network-status is-connected))
+              (when-not (= type old-network-type)
+                (change-network-type old-network-type type (:is-connection-expensive details))))))
 
-(handlers/register-handler-fx
- :network/network-status-changed
- (fn [cofx [_ data]]
-   (handle-network-status-change cofx data)))
+(defn add-net-info-listener []
+  (when react-components/net-info
+    (.addEventListener react-components/net-info
+                       #(re-frame/dispatch [::network-info-changed
+                                            (js->clj % :keywordize-keys true)]))))
+
+(re-frame/reg-fx
+ ::listen-to-network-info
+ (fn []
+   (add-net-info-listener)))
 
 (re-frame/reg-fx
  :network/notify-status-go
- (fn [data]
-   (status/connection-change data)))
+ (fn [[network-type expensive?]]
+   (status/connection-change network-type expensive?)))

test/cljs/status_im/react_native/js_dependencies.cljs

@@ -27,7 +27,6 @@
 (def vector-icons           #js {:default #js {}})
 (def webview-bridge         #js {:default #js {}})
 (def webview                #js {:WebView #js {}})
-(def svg                    #js {:default #js {}})
 (def status-keycard         #js {:default #js {}})
 
 (defrecord Notification [])
@@ -54,4 +53,7 @@
 (def desktop-config #js {})
 (def react-native-mail #js {:mail #js {}})
 (def react-native-navigation-twopane  #js {})
-
+(def react-native-screens  #js {})
+(def react-native-shake  #js {})
+(def net-info  #js {})
+(def touchid  #js {})