Final API23 (Android 6) Support Release

app/build.gradle

@@ -85,8 +85,8 @@ android {
         }
     }
     defaultConfig {
-        versionCode 202
-        versionName "3.58.3"
+        versionCode 203
+        versionName "3.59"
 
         applicationId "io.stormbird.wallet"
         minSdkVersion 23
@@ -184,6 +184,8 @@ android {
         abortOnError false
     }
     compileOptions {
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
         targetCompatibility JavaVersion.VERSION_1_8
         sourceCompatibility JavaVersion.VERSION_1_8
     }
@@ -273,8 +275,9 @@ dependencies {
     implementation 'com.github.apl-devs:appintro:v4.2.2'
     implementation 'com.github.romandanylyk:PageIndicatorView:v1.0.0'
 
-    //coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
+    implementation 'io.reactivex:rxjava:1.2.4'
     // ReactiveX
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"

app/src/main/java/com/alphawallet/app/repository/PreferenceRepositoryType.java

@@ -60,6 +60,8 @@ public interface PreferenceRepositoryType {
     void setHasSetNetworkFilters();
     boolean hasSetNetworkFilters();
     void blankHasSetNetworkFilters();
+    void cancelAPI23Notification();
+    boolean hasCancelledAPI23Notification();
 
     void commit();
 

app/src/main/java/com/alphawallet/app/repository/SharedPreferenceRepository.java

@@ -45,6 +45,7 @@ public class SharedPreferenceRepository implements PreferenceRepositoryType {
     private static final String RATE_APP_SHOWN = "rate_us_shown";
     private static final String LAUNCH_COUNT = "launch_count";
     private static final String NEW_WALLET = "new_wallet_";
+    private static final String API23_NOTIFICATION = "api23_notification";
 
     private final SharedPreferences pref;
 
@@ -243,6 +244,18 @@ public void blankHasSetNetworkFilters()
         pref.edit().putBoolean(SET_NETWORK_FILTERS, false).apply();
     }
 
+    @Override
+    public void cancelAPI23Notification()
+    {
+        pref.edit().putBoolean(API23_NOTIFICATION, true).apply();
+    }
+
+    @Override
+    public boolean hasCancelledAPI23Notification()
+    {
+        return pref.getBoolean(API23_NOTIFICATION, false);
+    }
+
     //Ensure settings are committed
     @SuppressLint("ApplySharedPref")
     @Override

app/src/main/java/com/alphawallet/app/ui/NewSettingsFragment.java

@@ -175,15 +175,15 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     private void initNotificationView(View view)
     {
         notificationView = view.findViewById(R.id.notification);
-        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M)
+        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M && !viewModel.hasShownAPI23Notification())
         {
             notificationView.setTitle(getContext().getString(R.string.title_version_support_warning));
             notificationView.setMessage(getContext().getString(R.string.message_version_support_warning));
             notificationView.setPrimaryButtonText(getContext().getString(R.string.hide_notification));
             notificationView.setPrimaryButtonListener(() ->
             {
                 notificationView.setVisibility(View.GONE);
-                viewModel.setMarshMallowWarning(true);
+                viewModel.cancelAPI23Notification();
             });
         }
         else

app/src/main/java/com/alphawallet/app/ui/WalletFragment.java

@@ -757,7 +757,7 @@ public boolean onMenuItemClick(MenuItem menuItem)
     {
         if (menuItem.getItemId() == R.id.action_my_wallet)
         {
-            viewModel.showMyAddress(getContext());
+            viewModel.showMyAddress(requireContext());
         }
         if (menuItem.getItemId() == R.id.action_scan)
         {
@@ -769,13 +769,12 @@ public boolean onMenuItemClick(MenuItem menuItem)
     private void initNotificationView(View view)
     {
         NotificationView notificationView = view.findViewById(R.id.notification);
-        boolean hasShownWarning = viewModel.isMarshMallowWarningShown();
 
-        if (!hasShownWarning && android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M)
+        if (!viewModel.isMarshMallowWarningShown() && android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M)
         {
-            notificationView.setTitle(getContext().getString(R.string.title_version_support_warning));
-            notificationView.setMessage(getContext().getString(R.string.message_version_support_warning));
-            notificationView.setPrimaryButtonText(getContext().getString(R.string.hide_notification));
+            notificationView.setTitle(requireContext().getString(R.string.title_version_support_warning));
+            notificationView.setMessage(requireContext().getString(R.string.message_version_support_warning));
+            notificationView.setPrimaryButtonText(requireContext().getString(R.string.hide_notification));
             notificationView.setPrimaryButtonListener(() ->
             {
                 notificationView.setVisibility(View.GONE);

app/src/main/java/com/alphawallet/app/viewmodel/NewSettingsViewModel.java

@@ -1,9 +1,10 @@
 package com.alphawallet.app.viewmodel;
 
 
+import android.content.Context;
+
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
-import android.content.Context;
 
 import com.alphawallet.app.entity.CurrencyItem;
 import com.alphawallet.app.entity.LocaleItem;
@@ -147,7 +148,13 @@ public void setIsDismissed(String walletAddr, boolean isDismissed)
         genericWalletInteract.setIsDismissed(walletAddr, isDismissed);
     }
 
-    public void setMarshMallowWarning(boolean shown) {
-        preferenceRepository.setMarshMallowWarning(shown);
+    public boolean hasShownAPI23Notification()
+    {
+        return preferenceRepository.hasCancelledAPI23Notification();
+    }
+
+    public void cancelAPI23Notification()
+    {
+        preferenceRepository.cancelAPI23Notification();
     }
 }

app/src/main/java/com/alphawallet/app/viewmodel/TransactionDetailViewModel.java

@@ -233,7 +233,7 @@ private void storeTx(EthTransaction rawTx, Wallet wallet, long chainId, Web3j we
             return;
         }
 
-        org.web3j.protocol.core.methods.response.Transaction ethTx = rawTx.getTransaction().get();
+        org.web3j.protocol.core.methods.response.Transaction ethTx = rawTx.getTransaction();    // no Optional<> in API23
         disposable = EventUtils.getBlockDetails(ethTx.getBlockHash(), web3j)
                 .map(ethBlock -> new Transaction(ethTx, chainId, true, ethBlock.getBlock().getTimestamp().longValue()))
                 .map(tx -> writeTransaction(wallet, tx))

app/src/main/java/com/alphawallet/app/web3/Web3View.java

@@ -1,11 +1,7 @@
 package com.alphawallet.app.web3;
 
-import static androidx.webkit.WebSettingsCompat.FORCE_DARK_OFF;
-import static androidx.webkit.WebSettingsCompat.FORCE_DARK_ON;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.os.Build;
 import android.util.AttributeSet;
@@ -19,8 +15,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-import androidx.webkit.WebSettingsCompat;
-import androidx.webkit.WebViewFeature;
 
 import com.alphawallet.app.BuildConfig;
 import com.alphawallet.app.entity.URLLoadInterface;
@@ -35,6 +29,8 @@
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -380,7 +376,7 @@ else if (!loadingError && loadInterface != null)
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, String url)
         {
-            redirect = true;
+            redirect = isRedirect(view, url);
 
             return externalClient.shouldOverrideUrlLoading(view, url)
                     || internalClient.shouldOverrideUrlLoading(view, url);
@@ -398,10 +394,42 @@ public void onReceivedError(WebView view, WebResourceRequest request, WebResourc
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request)
         {
-            redirect = true;
+            redirect = isRedirect(view, request);
 
             return externalClient.shouldOverrideUrlLoading(view, request)
                     || internalClient.shouldOverrideUrlLoading(view, request);
         }
+
+        private boolean isRedirect(WebView view, String url)
+        {
+            try
+            {
+                return isRedirect(new URL(view.getUrl()), new URL(url));
+            }
+            catch (MalformedURLException e)
+            {
+                return true;
+            }
+        }
+
+        private boolean isRedirect(WebView view, WebResourceRequest request)
+        {
+            try
+            {
+                return isRedirect(new URL(view.getUrl()), new URL(request.toString()));
+            }
+            catch (MalformedURLException e)
+            {
+                return true;
+            }
+        }
+
+        private boolean isRedirect(URL urlSource, URL urlDestination)
+        {
+            String sourceBase = urlSource.getHost();
+            String destinationBase = urlDestination.getHost();
+
+            return !sourceBase.equals(destinationBase) || urlSource.toString().equals(urlDestination.toString());
+        }
     }
 }

app/src/main/java/com/alphawallet/app/widget/InputAmount.java

@@ -1,5 +1,8 @@
 package com.alphawallet.app.widget;
 
+import static com.alphawallet.app.C.GAS_LIMIT_MIN;
+import static com.alphawallet.app.repository.TokensRealmSource.databaseKey;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Handler;
@@ -36,14 +39,14 @@
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 
+import io.reactivex.Completable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import io.realm.Case;
 import io.realm.Realm;
 import io.realm.RealmQuery;
 import timber.log.Timber;
 
-import static com.alphawallet.app.C.GAS_LIMIT_MIN;
-import static com.alphawallet.app.repository.TokensRealmSource.databaseKey;
-
 /**
  * Created by JB on 10/11/2020.
  */
@@ -384,8 +387,8 @@ private void setupAllFunds()
             if (token.isEthereum() && token.hasPositiveBalance())
             {
                 RealmGasSpread gasSpread = tokensService.getTickerRealmInstance().where(RealmGasSpread.class)
-                            .equalTo("chainId", token.tokenInfo.chainId)
-                            .findFirst();
+                        .equalTo("chainId", token.tokenInfo.chainId)
+                        .findFirst();
 
                 if (gasSpread != null && gasSpread.getGasPrice().compareTo(BigInteger.ZERO) > 0)
                 {
@@ -396,9 +399,23 @@ private void setupAllFunds()
                 {
                     gasFetch.setVisibility(View.VISIBLE);
                     Web3j web3j = TokenRepository.getWeb3jService(token.tokenInfo.chainId);
-                    web3j.ethGasPrice().sendAsync()
-                            .thenAccept(ethGasPrice -> onLatestGasPrice(ethGasPrice.getGasPrice()))
-                            .exceptionally(this::onGasFetchError);
+                    Completable.fromRunnable(() ->
+                                    {
+                                        try
+                                        {
+                                            onLatestGasPrice(web3j.ethGasPrice().sendAsync().get().getGasPrice());
+                                        }
+                                        catch (Exception e)
+                                        {
+                                            e.printStackTrace();
+                                            onGasFetchError(e);
+                                        }
+                                    }
+                            )
+                            .subscribeOn(Schedulers.io())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(() -> {}, this::onGasFetchError)
+                            .isDisposed();
                 }
             }
             else

app/src/main/res/values-es/strings.xml

@@ -573,7 +573,7 @@
     <string name="your_wallets">Tus monederos</string>
     <string name="action_copy">Copiar</string>
     <string name="title_version_support_warning">Actualización importante</string>
-    <string name="message_version_support_warning">A partir de la versión 3.0, AlphaWallet ya no será compatible con dispositivos que ejecuten Android 6.0 o inferior.</string>
+    <string name="message_version_support_warning">Esta es la versión final de los dispositivos compatibles con AlphaWallet que se ejecutan en Android 6.</string>
     <string name="hide_notification">Ocultar notificación</string>
     <string name="card_view_not_found_error">%1$s no encontrado</string>
     <string name="tokenscript_management">Gestión de TokenScript</string>

app/src/main/res/values-fr/strings.xml

@@ -583,7 +583,7 @@
     <string name="your_wallets">Vos Portefeuilles</string>
     <string name="action_copy">Copier</string>
     <string name="title_version_support_warning">Mise à jour importante</string>
-    <string name="message_version_support_warning">À partir de la version 3.0, AlphaWallet ne prendra plus en charge les appareils fonctionnant sous Android 6.0 et versions antérieures.</string>
+    <string name="message_version_support_warning">Il s\'agit de la version finale d\'AlphaWallet prenant en charge les appareils fonctionnant sous Android 6.</string>
     <string name="hide_notification">Cacher Notification</string>
     <string name="card_view_not_found_error">%1$s pas trouvé</string>
     <string name="tokenscript_management">Gestion TokenScript</string>

app/src/main/res/values-id/strings.xml

@@ -584,7 +584,7 @@
     <string name="your_wallets">Dompet Anda</string>
     <string name="action_copy">Salin</string>
     <string name="title_version_support_warning">Pembaruan Penting</string>
-    <string name="message_version_support_warning">Mulai Versi 3.0, AlphaWallet tidak mendukung perangkat yang berjalan di Android 6.0 dan di bawahnya.</string>
+    <string name="message_version_support_warning">Ini adalah build terakhir dari perangkat pendukung AlphaWallet yang berjalan di Android 6.</string>
     <string name="hide_notification">Sembunyikan Pemberitahuan</string>
     <string name="card_view_not_found_error">%1$s tidak ditemukan</string>
     <string name="tokenscript_management">Pengelolaan TokenScript</string>

app/src/main/res/values-my/strings.xml

@@ -590,7 +590,7 @@
     <string name="your_wallets">သင်၏ ဝေါလက်များ</string>
     <string name="action_copy">ကူးယူမည်</string>
     <string name="title_version_support_warning">အရေးကြီးသောအသစ်ပြုပြင်မွမ်းမံမှုများ</string>
-    <string name="message_version_support_warning">Alphawalletဗားရှင်း 3.0မှစ၍ Wallet သည် Android ဗားရှင်း 6.0ထက်နိမ့်သောစက်များတွင်အသုံးမပြုနိုင်တော့ပါ။</string>
+    <string name="message_version_support_warning">၎င်းသည် Android 6 ပေါ်တွင် အသုံးပြုနေသည့် AlphaWallet ပံ့ပိုးပေးသည့် စက်ပစ္စည်းများ၏ နောက်ဆုံးတည်ဆောက်မှုဖြစ်သည်။</string>
     <string name="hide_notification">အသိပေးကြေငြာချက်များကိုပုန်းကွယ်မည်</string>
     <string name="card_view_not_found_error">%1$s ကိုရှာမတွေ့ပါ</string>
     <string name="tokenscript_management">TokenScriptကို စီမံခန့်ခွဲခြင်း</string>

app/src/main/res/values-vi/strings.xml

@@ -586,7 +586,7 @@
     <string name="your_wallets">Ví của bạn</string>
     <string name="action_copy">Sao chép</string>
     <string name="title_version_support_warning">Important Update</string>
-    <string name="message_version_support_warning">Bắt đầu từ Phiên bản 3.0, AlphaWallet sẽ không còn hỗ trợ các thiết bị chạy trên Android 6.0 trở xuống.</string>
+    <string name="message_version_support_warning">Đây là bản dựng cuối cùng của AlphaWallet hỗ trợ các thiết bị chạy trên Android 6.</string>
     <string name="hide_notification">Tắt thông báo</string>
     <string name="card_view_not_found_error">%1$s not found</string>
     <string name="tokenscript_management">TokenScript Management</string>

app/src/main/res/values-zh/strings.xml

@@ -573,7 +573,7 @@
     <string name="your_wallets">您的钱包</string>
     <string name="action_copy">复制</string>
     <string name="title_version_support_warning">重要更新</string>
-    <string name="message_version_support_warning">从版本 3.0 开始，AlphaWallet 将不再支持在 Android 6.0 及以下设备上运行。</string>
+    <string name="message_version_support_warning">这是 AlphaWallet 的最终版本，支持在 Android 6 上运行的设备。</string>
     <string name="hide_notification">隐藏通知</string>
     <string name="card_view_not_found_error">未找到%1$s</string>
     <string name="tokenscript_management">TokenScript 管理</string>

app/src/main/res/values/strings.xml

@@ -616,7 +616,7 @@
     <string name="your_wallets">Your Wallets</string>
     <string name="action_copy">Copy</string>
     <string name="title_version_support_warning">Important Update</string>
-    <string name="message_version_support_warning">Starting Version 3.0, AlphaWallet will no longer support devices running on Android 6.0 and below.</string>
+    <string name="message_version_support_warning">This is the final build of AlphaWallet supporting devices running on Android 6.</string>
     <string name="hide_notification">Hide Notification</string>
     <string name="card_view_not_found_error">%1$s not found</string>
     <string name="tokenscript_management">TokenScript Management</string>