update website url

Author: Mas7erMind

README.md

@@ -18,8 +18,8 @@ A secure and light weight wallet to store your Scala coins on any Android device
 * Forked from [monerujo](https://github.com/m2049r/xmrwallet)
 
 ## Contacts
-* [Website](https://scalaproject.io/)
-* [hello@scalaproject.io](mailto:hello@scalaproject.io)
+* [Website](https://scala.network/)
+* [hello@scala.network](mailto:hello@scala.network)
 * [Discord](https://discord.gg/djAFVvy)
 * [Telegram](https://t.me/scalaofficial)
 * [Twitter](https://twitter.com/scalahq)

app.json

@@ -1,10 +1,10 @@
 {
     "nodes": [{
-            "host": "remote.one.scalaproject.io",
+            "host": "remote.one.scala.network",
             "port": "11812"
         },
         {
-            "host": "remote.two.scalaproject.io",
+            "host": "remote.two.scala.network",
             "port": "11812"
         },
         {

app/build.gradle

@@ -7,8 +7,8 @@ android {
         compileSdk 33
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 12
-        versionName "1.1.1"
+        versionCode 13
+        versionName "1.1.2"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         externalNativeBuild {

app/src/main/java/io/scalaproject/vault/LoginActivity.java

@@ -104,7 +104,7 @@ public class LoginActivity extends BaseActivity
     // USAGE: The GitHub raw file might not be available in some countries, so the IPFS option
     //        is a fallback. When the DEFAULT_NODES_REPOSITORY file is modified, we need to upload the new file
     //        to the IPNS gateway as well.
-    static private final String IPNS_NAME = "node-list.scalaproject.io";
+    static private final String IPNS_NAME = "node-list.scala.network";
     static private final String[] NODES_REPOSITORY_IPNS_GATEWAYS = {
             "https://dweb.link/ipns/",
             "https://ipfs.io/ipns/",
@@ -115,7 +115,7 @@ public class LoginActivity extends BaseActivity
     static private final String DEFAULT_NODE = "{\n" +
             "\"nodes\": [\n" +
             "{\n" +
-            "\"host\": \"remote.one.scalaproject.io\",\n" +
+            "\"host\": \"remote.one.scala.network\",\n" +
             "\"port\": \"11812\"\n" +
             "} ]\n" +
             "}";

app/src/main/java/io/scalaproject/vault/ScalaVaultApplication.java

@@ -37,17 +37,13 @@
 import timber.log.Timber;
 
 @AcraCore(buildConfigClass = BuildConfig.class)
-@AcraMailSender(mailTo = "[email protected]")
+@AcraMailSender(mailTo = "[email protected]")
 public class ScalaVaultApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
         SharedPreferences preferences = getSharedPreferences(getPackageName() + "_preferences", MODE_PRIVATE);
         Config.initialize(preferences);
-
-        if (BuildConfig.DEBUG) {
-            Timber.plant(new Timber.DebugTree());
-        }
     }
 
     @Override

app/src/main/java/io/scalaproject/vault/TxFragment.java

@@ -250,7 +250,7 @@ private void show(TransactionInfo info) {
         tvTxId.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String paymentURL = "https://explorer.scalaproject.io/tx/" + tvTxId.getText();
+                String paymentURL = "https://explorer.scala.network/tx/" + tvTxId.getText();
                 Uri uri = Uri.parse(paymentURL);
                 startActivity(new Intent(Intent.ACTION_VIEW, uri));
             }

app/src/main/java/io/scalaproject/vault/WalletActivity.java

@@ -807,14 +807,16 @@ public void run() {
             });
         }
 
-        Wallet wal = getWallet();
-        String walletAddress = wal.getAddress();
-        if (walletAddress != null) {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    initWalletFragmentAddress(walletAddress);
-                }
-            });
+        Wallet wallet = getWallet();
+        if(wallet != null ) {
+            String walletAddress = wallet.getAddress();
+            if (walletAddress != null) {
+                runOnUiThread(new Runnable() {
+                    public void run() {
+                        initWalletFragmentAddress(walletAddress);
+                    }
+                });
+            }
         }
     }
 
@@ -881,11 +883,13 @@ public void onProgress(final String text) {
         try {
             final WalletFragment walletFragment = (WalletFragment)
                     getSupportFragmentManager().findFragmentByTag(WalletFragment.class.getName());
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    walletFragment.setProgress(text);
-                }
-            });
+            if(walletFragment != null) {
+                runOnUiThread(new Runnable() {
+                    public void run() {
+                        walletFragment.setProgress(text);
+                    }
+                });
+            }
         } catch (ClassCastException ex) {
             // not in wallet fragment (probably send scala)
             Timber.d(ex.getLocalizedMessage());
@@ -1326,8 +1330,11 @@ private void addAccount() {
     }
 
     public void onCopyAddress(View view) {
-        Helper.clipBoardCopy(this, getString(R.string.label_copy_address), getWallet().getAddress());
-        Toast.makeText(this, getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
+        Wallet wallet = getWallet();
+        if(wallet != null) {
+            Helper.clipBoardCopy(this, getString(R.string.label_copy_address), getWallet().getAddress());
+            Toast.makeText(this, getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
+        }
     }
 
     private class AsyncAddAccount extends AsyncTask<Void, Void, Boolean> {

app/src/main/java/io/scalaproject/vault/WalletFragment.java

@@ -529,7 +529,7 @@ private void updateWalletInfo(Wallet wallet) {
             tvAddressType.setText("Subaddress");
         }
 
-        if(wallet == null)
+        if(wallet != null)
             tvWalletAddress.setText(Helper.getPrettyAddress(wallet.getAddress()));
     }
 

app/src/main/java/io/scalaproject/vault/fragment/send/SendSuccessWizardFragment.java

@@ -129,7 +129,7 @@ public void onResumeFragment() {
             tvTxId.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    String paymentURL = "https://explorer.scalaproject.io/tx/" + tvTxId.getText();
+                    String paymentURL = "https://explorer.scala.network/tx/" + tvTxId.getText();
                     Uri uri = Uri.parse(paymentURL);
                     startActivity(new Intent(Intent.ACTION_VIEW, uri));
                 }

app/src/main/java/io/scalaproject/vault/service/exchange/kraken/ExchangeApiImpl.java

@@ -58,7 +58,7 @@ public ExchangeApiImpl(@NonNull final OkHttpClient okHttpClient, final HttpUrl b
     }
 
     public ExchangeApiImpl(@NonNull final OkHttpClient okHttpClient) {
-        this(okHttpClient, HttpUrl.parse("https://prices.scalaproject.io/"));
+        this(okHttpClient, HttpUrl.parse("https://prices.scala.network/"));
     }
 
     @Override