Fix for token send and tidy up code

AlphaWallet · Feb 19, 2024 · 5ea7b3b · 5ea7b3b
1 parent c18d4ec
commit 5ea7b3b
Show file tree

Hide file tree

Showing 19 changed files with 202 additions and 101 deletions.
diff --git a/app/src/main/java/com/alphawallet/app/repository/PreferenceRepositoryType.java b/app/src/main/java/com/alphawallet/app/repository/PreferenceRepositoryType.java
@@ -142,4 +142,8 @@ public interface PreferenceRepositoryType
     boolean isPostNotificationsPermissionRequested(String address);
 
     void setPostNotificationsPermissionRequested(String address, boolean hasRequested);
+
+    boolean getUseTSViewer();
+
+    void setUseTSViewer(boolean toggleState);
 }
diff --git a/app/src/main/java/com/alphawallet/app/repository/SharedPreferenceRepository.java b/app/src/main/java/com/alphawallet/app/repository/SharedPreferenceRepository.java
@@ -32,6 +32,7 @@ public class SharedPreferenceRepository implements PreferenceRepositoryType {
     public static final String HIDE_ZERO_BALANCE_TOKENS = "hide_zero_balance_tokens";
     public static final String FULL_SCREEN_STATE = "full_screen";
     public static final String EXPERIMENTAL_1559_TX = "ex_1559_tx";
+    public static final String USE_TOKENSCRIPT_VIEWER = "use_ts_viewer";
     public static final String DEVELOPER_OVERRIDE = "developer_override";
     public static final String TESTNET_ENABLED = "testnet_enabled";
     public static final String PRICE_ALERTS = "price_alerts";
@@ -469,10 +470,23 @@ public boolean isPostNotificationsPermissionRequested(String address) {
     }
 
     @Override
-    public void setPostNotificationsPermissionRequested(String address, boolean hasRequested) {
+    public void setPostNotificationsPermissionRequested(String address, boolean hasRequested)
+    {
         pref.edit().putBoolean(getAddressKey(POST_NOTIFICATIONS_PERMISSION_REQUESTED, address), hasRequested).apply();
     }
 
+    @Override
+    public boolean getUseTSViewer()
+    {
+        return pref.getBoolean(USE_TOKENSCRIPT_VIEWER, true);
+    }
+
+    @Override
+    public void setUseTSViewer(boolean state)
+    {
+        pref.edit().putBoolean(USE_TOKENSCRIPT_VIEWER, state).apply();
+    }
+
     @NonNull
     private String getAddressKey(String key, String address)
     {

diff --git a/app/src/main/java/com/alphawallet/app/ui/AdvancedSettingsActivity.java b/app/src/main/java/com/alphawallet/app/ui/AdvancedSettingsActivity.java
@@ -47,6 +47,7 @@ public class AdvancedSettingsActivity extends BaseActivity
     private SettingsItemView analytics;
     private SettingsItemView crashReporting;
     private SettingsItemView developerOverride;
+    private SettingsItemView tokenScriptViewer;
     private AWalletAlertDialog waitDialog = null;
 
     @Nullable
@@ -57,7 +58,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         viewModel = new ViewModelProvider(this)
-            .get(AdvancedSettingsViewModel.class);
+                .get(AdvancedSettingsViewModel.class);
 
         setContentView(R.layout.activity_generic_settings);
         toolbar();
@@ -82,68 +83,74 @@ public void onDestroy()
     private void initializeSettings()
     {
         nodeStatus = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_node_status)
-            .withTitle(R.string.action_node_status)
-            .withListener(this::onNodeStatusClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_node_status)
+                .withTitle(R.string.action_node_status)
+                .withListener(this::onNodeStatusClicked)
+                .build();
 
         console = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_console)
-            .withTitle(R.string.title_console)
-            .withListener(this::onConsoleClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_console)
+                .withTitle(R.string.title_console)
+                .withListener(this::onConsoleClicked)
+                .build();
 
         clearBrowserCache = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_cache)
-            .withTitle(R.string.title_clear_browser_cache)
-            .withListener(this::onClearBrowserCacheClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_cache)
+                .withTitle(R.string.title_clear_browser_cache)
+                .withListener(this::onClearBrowserCacheClicked)
+                .build();
 
         tokenScript = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_tokenscript)
-            .withTitle(R.string.title_tokenscript)
-            .withListener(this::onTokenScriptClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_tokenscript)
+                .withTitle(R.string.title_tokenscript)
+                .withListener(this::onTokenScriptClicked)
+                .build();
 
         //TODO Change Icon
         tokenScriptManagement = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_tokenscript_manage)
-            .withTitle(R.string.tokenscript_management)
-            .withListener(this::onTokenScriptManagementClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_tokenscript_manage)
+                .withTitle(R.string.tokenscript_management)
+                .withListener(this::onTokenScriptManagementClicked)
+                .build();
+
+        tokenScriptViewer = new SettingsItemView.Builder(this)
+                .withType(SettingsItemView.Type.TOGGLE)
+                .withIcon(R.drawable.ic_tokenscript)
+                .withTitle(R.string.use_tokenscript_viewer)
+                .withListener(this::onUseTokenScriptViewer)
+                .build();
 
         fullScreenSettings = new SettingsItemView.Builder(this)
-            .withType(SettingsItemView.Type.TOGGLE)
-            .withIcon(R.drawable.ic_phoneicon)
-            .withTitle(R.string.fullscreen)
-            .withListener(this::onFullScreenClicked)
-            .build();
+                .withType(SettingsItemView.Type.TOGGLE)
+                .withIcon(R.drawable.ic_phoneicon)
+                .withTitle(R.string.fullscreen)
+                .withListener(this::onFullScreenClicked)
+                .build();
 
         refreshTokenDatabase = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_reset_tokens)
-            .withTitle(R.string.title_reload_token_data)
-            .withListener(this::onReloadTokenDataClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_reset_tokens)
+                .withTitle(R.string.title_reload_token_data)
+                .withListener(this::onReloadTokenDataClicked)
+                .build();
 
         eip1559Transactions = new SettingsItemView.Builder(this)
-            .withType(SettingsItemView.Type.TOGGLE)
-            .withIcon(R.drawable.ic_icons_settings_1559)
-            .withTitle(R.string.experimental_1559)
-//            .withSubtitle(R.string.experimental_1559_tx_sub)
-            .withListener(this::on1559TransactionsClicked)
-            .build();
+                .withType(SettingsItemView.Type.TOGGLE)
+                .withIcon(R.drawable.ic_icons_settings_1559)
+                .withTitle(R.string.experimental_1559)
+                .withListener(this::on1559TransactionsClicked)
+                .build();
 
         analytics = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_analytics)
-            .withTitle(R.string.settings_title_analytics)
-            .withListener(this::onAnalyticsClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_analytics)
+                .withTitle(R.string.settings_title_analytics)
+                .withListener(this::onAnalyticsClicked)
+                .build();
 
         crashReporting = new SettingsItemView.Builder(this)
-            .withIcon(R.drawable.ic_settings_crash_reporting)
-            .withTitle(R.string.settings_title_crash_reporting)
-            .withListener(this::onCrashReportingClicked)
-            .build();
+                .withIcon(R.drawable.ic_settings_crash_reporting)
+                .withTitle(R.string.settings_title_crash_reporting)
+                .withListener(this::onCrashReportingClicked)
+                .build();
 
         developerOverride = new SettingsItemView.Builder(this)
                 .withType(SettingsItemView.Type.TOGGLE)
@@ -155,6 +162,7 @@ private void initializeSettings()
         fullScreenSettings.setToggleState(viewModel.getFullScreenState());
         eip1559Transactions.setToggleState(viewModel.get1559TransactionsState());
         developerOverride.setToggleState(viewModel.getDeveloperOverrideState());
+        tokenScriptViewer.setToggleState(viewModel.getTokenScriptViewerState());
     }
 
     private void onDeveloperOverride()
@@ -172,6 +180,11 @@ private void on1559TransactionsClicked()
         viewModel.toggle1559Transactions(eip1559Transactions.getToggleState());
     }
 
+    private void onUseTokenScriptViewer()
+    {
+        viewModel.toggleUseViewer(tokenScriptViewer.getToggleState());
+    }
+
     private void addSettingsToLayout()
     {
         LinearLayout advancedSettingsLayout = findViewById(R.id.layout);
@@ -186,6 +199,7 @@ private void addSettingsToLayout()
         advancedSettingsLayout.addView(fullScreenSettings);
         advancedSettingsLayout.addView(refreshTokenDatabase);
         advancedSettingsLayout.addView(eip1559Transactions);
+        advancedSettingsLayout.addView(tokenScriptViewer);
         advancedSettingsLayout.addView(analytics);
         advancedSettingsLayout.addView(crashReporting);
         advancedSettingsLayout.addView(developerOverride);
@@ -204,25 +218,25 @@ private void onConsoleClicked()
     private void onClearBrowserCacheClicked()
     {
         Single.fromCallable(() ->
-            {
-                WebView webView = new WebView(this);
-                webView.clearCache(true);
-                webView.clearFormData();
-                webView.clearHistory();
-                webView.clearSslPreferences();
-                CookieManager cookieManager = CookieManager.getInstance();
-                cookieManager.removeAllCookies(null);
-                WebStorage.getInstance().deleteAllData();
-                viewModel.blankFilterSettings();
-                Glide.get(this).clearDiskCache();
-                return 1;
-            }).subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(v ->
-            {
-                Toast.makeText(this, getString(R.string.toast_browser_cache_cleared), Toast.LENGTH_SHORT).show();
-                finish();
-            }).isDisposed();
+                {
+                    WebView webView = new WebView(this);
+                    webView.clearCache(true);
+                    webView.clearFormData();
+                    webView.clearHistory();
+                    webView.clearSslPreferences();
+                    CookieManager cookieManager = CookieManager.getInstance();
+                    cookieManager.removeAllCookies(null);
+                    WebStorage.getInstance().deleteAllData();
+                    viewModel.blankFilterSettings();
+                    Glide.get(this).clearDiskCache();
+                    return 1;
+                }).subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(v ->
+                {
+                    Toast.makeText(this, getString(R.string.toast_browser_cache_cleared), Toast.LENGTH_SHORT).show();
+                    finish();
+                }).isDisposed();
     }
 
     private void onReloadTokenDataClicked()
@@ -242,9 +256,9 @@ private void onReloadTokenDataClicked()
             viewModel.stopChainActivity();
             showWaitDialog();
             clearTokenCache = viewModel.resetTokenData()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::showResetResult);
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(this::showResetResult);
 
             viewModel.blankFilterSettings();
         });
@@ -340,7 +354,7 @@ private void askWritePermission()
     private boolean checkWritePermission()
     {
         return ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            == PackageManager.PERMISSION_GRANTED;
+                == PackageManager.PERMISSION_GRANTED;
     }
 
     @Override

diff --git a/app/src/main/java/com/alphawallet/app/ui/NFTAssetDetailActivity.java b/app/src/main/java/com/alphawallet/app/ui/NFTAssetDetailActivity.java
@@ -114,8 +114,7 @@ public class NFTAssetDetailActivity extends BaseActivity implements StandardFunc
     private boolean triggeredReload;
     private long chainId;
     private Web3TokenView tokenScriptView;
-    private static final boolean FORCE_EMBEDDED_VIEWER = true;
-    private boolean useNativeTokenScript = false;
+    private boolean usingNativeTokenScript = false;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState)
@@ -291,7 +290,7 @@ private void handleShortCut(String walletAddress)
         token = viewModel.getTokensService().getToken(walletAddress, chainId, tokenAddress);
         if (token == null)
         {
-            ShortcutUtils.showConfirmationDialog(this, singletonList(tokenAddress), getString(R.string.remove_shortcut_while_token_not_found));
+            ShortcutUtils.showConfirmationDialog(this, singletonList(tokenAddress), getString(R.string.remove_shortcut_while_token_not_found), null);
         }
         else
         {
@@ -307,9 +306,10 @@ private void setup()
         setTitle(token.tokenInfo.name);
         updateDefaultTokenData();
 
-        if (!NFTAssetDetailActivity.FORCE_EMBEDDED_VIEWER) {
+        if (!viewModel.getUseTSViewer())
+        {
             TokenDefinition td = viewModel.getAssetDefinitionService().getAssetDefinition(this.token);
-            this.useNativeTokenScript = td.nameSpace != null;
+            this.usingNativeTokenScript = td.nameSpace != null;
         }
 
         if (asset != null && asset.isAttestation())
@@ -319,8 +319,10 @@ private void setup()
         else
         {
             viewModel.getAsset(token, tokenId);
-            if (this.useNativeTokenScript)
+            if (this.usingNativeTokenScript)
+            {
                 viewModel.updateLocalAttributes(token, tokenId);  //when complete calls displayTokenView
+            }
         }
     }
 
@@ -352,8 +354,10 @@ private void newScriptFound(TokenDefinition td)
 
             setTitle(token.getTokenName(viewModel.getAssetDefinitionService(), 1));
 
-            if (!NFTAssetDetailActivity.FORCE_EMBEDDED_VIEWER)
-                this.useNativeTokenScript = td.nameSpace != null;
+            if (!viewModel.getUseTSViewer())
+            {
+                this.usingNativeTokenScript = td.nameSpace != null;
+            }
 
             //now re-load the verbs if already called. If wallet is null this won't complete
             setupFunctionBar(viewModel.getWallet());
@@ -362,10 +366,9 @@ private void newScriptFound(TokenDefinition td)
             {
                 setupAttestation(td);
             }
-            else
+            else if (this.usingNativeTokenScript)
             {
-                if (this.useNativeTokenScript)
-                    displayTokenView(td);
+                displayTokenView(td);
             }
         }
         else
@@ -402,9 +405,12 @@ private void setupFunctionBar(Wallet wallet)
         {
             FunctionButtonBar functionBar = findViewById(R.id.layoutButtons);
 
-            if (this.useNativeTokenScript){
+            if (this.usingNativeTokenScript)
+            {
                 functionBar.setupFunctions(this, viewModel.getAssetDefinitionService(), token, null, Collections.singletonList(tokenId));
-            } else {
+            }
+            else
+            {
                 functionBar.setupFunctionsForJsViewer(this, R.string.title_tokenscript, this.token, Collections.singletonList(tokenId));
             }
 

diff --git a/app/src/main/java/com/alphawallet/app/ui/TokenScriptJsActivity.java b/app/src/main/java/com/alphawallet/app/ui/TokenScriptJsActivity.java
@@ -242,7 +242,7 @@ private void handleShortCut(String walletAddress)
         token = viewModel.getTokenService().getToken(walletAddress, chainId, tokenAddress);
         if (token == null)
         {
-            ShortcutUtils.showConfirmationDialog(this, singletonList(tokenAddress), getString(R.string.remove_shortcut_while_token_not_found));
+            ShortcutUtils.showConfirmationDialog(this, singletonList(tokenAddress), getString(R.string.remove_shortcut_while_token_not_found), null);
         }
         else
         {