From e4eabd2810d492004de5808911316b90a6d7aca5 Mon Sep 17 00:00:00 2001
From: Pedro Pombeiro <pombeirp@users.noreply.github.com>
Date: Wed, 7 Aug 2019 15:08:22 +0200
Subject: [PATCH] Migrate to use AndroidX

---
 android/app/build.gradle                                      | 3 +--
 android/app/src/main/AndroidManifest.xml                      | 2 +-
 .../app/src/main/java/im/status/ethereum/MainActivity.java    | 4 ++--
 .../app/src/main/java/im/status/ethereum/MainApplication.java | 2 +-
 .../src/main/java/im/status/ethereum/module/StatusModule.java | 2 +-
 nix/mobile/android/maven-and-npm-deps/default.nix             | 3 +++
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 4c96b6ae9c..720e3120fd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -311,9 +311,8 @@ dependencies {
       implementation jscFlavor
     }
 
-    implementation 'com.android.support:multidex:1.0.2'
+    implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex)
     implementation project(':react-native-dialogs')
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
     // Force using exact RN version instead of relying on gradle dependency resolution
     // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
     // NOTE: Uncomment if building RN from a fork
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 85e9ade088..cc53ca1660 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -85,7 +85,7 @@
         </service>
         <service android:name="io.invertase.firebase.messaging.RNFirebaseBackgroundMessagingService" />
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true"
diff --git a/android/app/src/main/java/im/status/ethereum/MainActivity.java b/android/app/src/main/java/im/status/ethereum/MainActivity.java
index cb8763aeab..c341a90276 100644
--- a/android/app/src/main/java/im/status/ethereum/MainActivity.java
+++ b/android/app/src/main/java/im/status/ethereum/MainActivity.java
@@ -2,7 +2,7 @@ package im.status.ethereum;
 
 import android.content.Context;
 import android.annotation.TargetApi;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.app.AlertDialog;
 import android.app.ActivityManager;
 import android.content.DialogInterface;
@@ -13,7 +13,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Looper;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 import android.util.Log;
 import android.view.WindowManager;
 import android.content.Intent;
diff --git a/android/app/src/main/java/im/status/ethereum/MainApplication.java b/android/app/src/main/java/im/status/ethereum/MainApplication.java
index f3d37852a0..4f467bf35f 100644
--- a/android/app/src/main/java/im/status/ethereum/MainApplication.java
+++ b/android/app/src/main/java/im/status/ethereum/MainApplication.java
@@ -1,6 +1,6 @@
 package im.status.ethereum;
 
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 import android.util.Log;
 import com.facebook.react.PackageList;
 import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
index 231075a33b..6d1f569fb7 100644
--- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
+++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
@@ -10,7 +10,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.util.Log;
 import android.view.Window;
 import android.view.WindowManager;
diff --git a/nix/mobile/android/maven-and-npm-deps/default.nix b/nix/mobile/android/maven-and-npm-deps/default.nix
index d3133cf57b..ea3dbb1032 100644
--- a/nix/mobile/android/maven-and-npm-deps/default.nix
+++ b/nix/mobile/android/maven-and-npm-deps/default.nix
@@ -145,6 +145,9 @@ let
               'nodeExecutableAndArgs: ["node"' \
               'nodeExecutableAndArgs: ["${nodejs}/bin/node"'
 
+          # Patch dependencies which are not yet ported to AndroidX
+          npx jetify
+
           set $prevSet
 
           runHook postPatch