MAJOR CHANGES: switched support libraries to Jetifier/android-X, upgraded gradle 5.3.1 => 5.4.1 Gradle Build tool 3.4.2 => 3.5.1, Fabrics tool 1.29 => 1.31.1, + many other libraries, SDK compile/target 28 => 29.

Author: logiclove

.idea/codeStyles/Project.xml

@@ -6,14 +6,14 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.bitcoin.merchant.app"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 40002
-        versionName "4.0.2"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 29
+        versionCode 40100
+        versionName "4.1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -38,26 +38,26 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'me.dm7.barcodescanner:zxing:1.9.13'
 
-    implementation 'com.google.guava:guava:24.1-android'
+    implementation 'com.google.guava:guava:28.1-android'
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
-    implementation 'com.neovisionaries:nv-websocket-client:2.8'
-    implementation 'com.google.code.gson:gson:2.5'
-    implementation 'commons-io:commons-io:2.6'
-    implementation 'commons-codec:commons-codec:1.11'
-    implementation 'org.apache.commons:commons-lang3:3.5'
-    implementation 'org.slf4j:slf4j-android:1.7.25'
+    implementation 'com.neovisionaries:nv-websocket-client:2.9'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'commons-io:commons-io:20030203.000550'
+    implementation 'commons-codec:commons-codec:20041127.091804'
+    implementation 'org.apache.commons:commons-lang3:3.9'
+    implementation 'org.slf4j:slf4j-android:1.7.28'
     implementation 'cash.bitcoinj:bitcoinj-core:0.14.5.2'
     implementation files('libs/MyWalletHD.jar')
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true;

app/app.iml

@@ -1,14 +1,10 @@
 package info.blockchain.merchant;
 
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -18,7 +14,5 @@
 public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
     }
 }

app/build.gradle

@@ -15,15 +15,6 @@
 import android.nfc.NfcEvent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.TabLayout;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -33,6 +24,14 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import com.bitcoin.merchant.app.database.PaymentRecord;
 import com.bitcoin.merchant.app.network.ExpectedAmounts;
 import com.bitcoin.merchant.app.network.ExpectedPayments;
@@ -53,6 +52,8 @@
 import com.bitcoin.merchant.app.util.AppUtil;
 import com.bitcoin.merchant.app.util.PrefsUtil;
 import com.crashlytics.android.Crashlytics;
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.tabs.TabLayout;
 
 import io.fabric.sdk.android.Fabric;
 
@@ -281,6 +282,7 @@ protected void onResume() {
 
     @Override
     protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
         setIntent(intent);
     }
 

app/src/androidTest/java/info/blockchain/merchant/ExampleInstrumentedTest.java

@@ -3,7 +3,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.bitcoin.merchant.app.MainActivity;
 

app/src/main/java/com/bitcoin/merchant/app/MainActivity.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 
 import com.bitcoin.merchant.app.MainActivity;

app/src/main/java/com/bitcoin/merchant/app/network/NetworkStateReceiver.java

@@ -3,7 +3,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 
 import com.bitcoin.merchant.app.MainActivity;

app/src/main/java/com/bitcoin/merchant/app/network/QueryTxTimeTask.java

@@ -0,0 +1,22 @@
+package com.bitcoin.merchant.app.network.websocket.impl.echo;
+
+import com.bitcoin.merchant.app.network.websocket.impl.TxWebSocketHandlerImpl;
+import com.neovisionaries.ws.client.WebSocket;
+import com.neovisionaries.ws.client.WebSocketFactory;
+
+import java.io.IOException;
+
+public class EchoWebSocketHandler extends TxWebSocketHandlerImpl {
+    public EchoWebSocketHandler() {
+        TAG = "NoOpSocket";
+    }
+
+    @Override
+    protected WebSocket createWebSocket(WebSocketFactory factory) throws IOException {
+        return factory.createSocket("wss://echo.websocket.org");
+    }
+
+    @Override
+    protected void parseTx(String message) throws Exception {
+    }
+}

app/src/main/java/com/bitcoin/merchant/app/network/QueryUtxoTask.java

@@ -6,8 +6,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/bitcoin/merchant/app/network/websocket/impl/echo/EchoWebSocketHandler.java

@@ -14,7 +14,7 @@
 import android.nfc.NfcEvent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
 import android.view.Window;

app/src/main/java/com/bitcoin/merchant/app/screens/PaymentInputFragment.java

@@ -14,9 +14,9 @@
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;

app/src/main/java/com/bitcoin/merchant/app/screens/PaymentRequestActivity.java

@@ -1,8 +1,8 @@
 package com.bitcoin.merchant.app.screens;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 public class TabsPagerAdapter extends FragmentPagerAdapter {
     public static final int TAB_INPUT_AMOUNT = 0;

app/src/main/java/com/bitcoin/merchant/app/screens/SettingsActivity.java

@@ -14,9 +14,9 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.RelativeSizeSpan;

app/src/main/java/com/bitcoin/merchant/app/screens/TabsPagerAdapter.java

@@ -1,7 +1,6 @@
 package com.bitcoin.merchant.app.screens.dialogs;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.widget.EditText;
 import android.widget.TextView;

app/src/main/java/com/bitcoin/merchant/app/screens/TransactionsHistoryFragment.java

@@ -5,7 +5,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.preference.Preference;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/bitcoin/merchant/app/screens/dialogs/AddNewAddressDialog.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.view.View;
 
 import com.bitcoin.merchant.app.R;