add more output currencies (#714)

replace xmr.to with SideShift.ai
random bugfixes
upgrade gradle & dependencies

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 602
-        versionName "1.16.2 'Karmic Nodes'"
+        versionCode 705
+        versionName "1.17.5.1 'Druk'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -56,6 +56,9 @@ android {
         debug {
             applicationIdSuffix ".debug"
         }
+        applicationVariants.all { variant ->
+            variant.buildConfigField "String", "ID_A", "\"" + getId("ID_A") + "\""
+        }
     }
 
     externalNativeBuild {
@@ -109,10 +112,16 @@ android {
     }
 }
 
+def getId(name) {
+    def Properties props = new Properties()
+    props.load(new FileInputStream(new File('monerujo.id')))
+    return props[name]
+}
+
 dependencies {
     implementation 'androidx.core:core:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'

app/src/main/java/com/m2049r/levin/scanner/LevinPeer.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.m2049r.levin.scanner;
 
 import java.net.InetAddress;

app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2017-2020 m2049r et al.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.m2049r.xmrwallet;
 
 import android.app.PendingIntent;
@@ -197,7 +213,7 @@ public class BaseActivity extends SecureActivity implements GenerateReviewFragme
                 if (uri == null) {
                     Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show();
                 } else {
-                    BarcodeData bc = BarcodeData.fromQrCode(uri.toString());
+                    BarcodeData bc = BarcodeData.fromString(uri.toString());
                     if (bc == null)
                         Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show();
                     else

app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@@ -301,24 +301,21 @@ public class LoginActivity extends BaseActivity
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
 
-        toolbar.setOnButtonListener(new Toolbar.OnButtonListener() {
-            @Override
-            public void onButton(int type) {
-                switch (type) {
-                    case Toolbar.BUTTON_BACK:
-                        onBackPressed();
-                        break;
-                    case Toolbar.BUTTON_CLOSE:
-                        finish();
-                        break;
-                    case Toolbar.BUTTON_CREDITS:
-                        CreditsFragment.display(getSupportFragmentManager());
-                        break;
-                    case Toolbar.BUTTON_NONE:
-                        break;
-                    default:
-                        Timber.e("Button " + type + "pressed - how can this be?");
-                }
+        toolbar.setOnButtonListener(type -> {
+            switch (type) {
+                case Toolbar.BUTTON_BACK:
+                    onBackPressed();
+                    break;
+                case Toolbar.BUTTON_CLOSE:
+                    finish();
+                    break;
+                case Toolbar.BUTTON_CREDITS:
+                    CreditsFragment.display(getSupportFragmentManager());
+                    break;
+                case Toolbar.BUTTON_NONE:
+                    break;
+                default:
+                    Timber.e("Button " + type + "pressed - how can this be?");
             }
         });
 
@@ -366,34 +363,31 @@ public class LoginActivity extends BaseActivity
     public void onWalletDetails(final String walletName) {
         Timber.d("details for wallet .%s.", walletName);
         if (checkServiceRunning()) return;
-        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                switch (which) {
-                    case DialogInterface.BUTTON_POSITIVE:
-                        final File walletFile = Helper.getWalletFile(LoginActivity.this, walletName);
-                        if (WalletManager.getInstance().walletExists(walletFile)) {
-                            Helper.promptPassword(LoginActivity.this, walletName, true, new Helper.PasswordAction() {
-                                @Override
-                                public void act(String walletName, String password, boolean fingerprintUsed) {
-                                    if (checkDevice(walletName, password))
-                                        startDetails(walletFile, password, GenerateReviewFragment.VIEW_TYPE_DETAILS);
-                                }
+        DialogInterface.OnClickListener dialogClickListener = (dialog, which) -> {
+            switch (which) {
+                case DialogInterface.BUTTON_POSITIVE:
+                    final File walletFile = Helper.getWalletFile(LoginActivity.this, walletName);
+                    if (WalletManager.getInstance().walletExists(walletFile)) {
+                        Helper.promptPassword(LoginActivity.this, walletName, true, new Helper.PasswordAction() {
+                            @Override
+                            public void act(String walletName1, String password, boolean fingerprintUsed) {
+                                if (checkDevice(walletName1, password))
+                                    startDetails(walletFile, password, GenerateReviewFragment.VIEW_TYPE_DETAILS);
+                            }
 
-                                @Override
-                                public void fail(String walletName, String password, boolean fingerprintUsed) {
-                                }
-                            });
-                        } else { // this cannot really happen as we prefilter choices
-                            Timber.e("Wallet missing: %s", walletName);
-                            Toast.makeText(LoginActivity.this, getString(R.string.bad_wallet), Toast.LENGTH_SHORT).show();
-                        }
-                        break;
+                            @Override
+                            public void fail(String walletName1, String password, boolean fingerprintUsed) {
+                            }
+                        });
+                    } else { // this cannot really happen as we prefilter choices
+                        Timber.e("Wallet missing: %s", walletName);
+                        Toast.makeText(LoginActivity.this, getString(R.string.bad_wallet), Toast.LENGTH_SHORT).show();
+                    }
+                    break;
 
-                    case DialogInterface.BUTTON_NEGATIVE:
-                        // do nothing
-                        break;
-                }
+                case DialogInterface.BUTTON_NEGATIVE:
+                    // do nothing
+                    break;
             }
         };
 

app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java

@@ -56,7 +56,9 @@ import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.data.BarcodeData;
+import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
@@ -468,7 +470,7 @@ public class ReceiveFragment extends Fragment {
             Timber.d("CLEARQR");
             return;
         }
-        bcData = new BarcodeData(BarcodeData.Asset.XMR, address, null, notes, xmrAmount);
+        bcData = new BarcodeData(Crypto.XMR, address, notes, xmrAmount);
         int size = Math.max(ivQrCode.getWidth(), ivQrCode.getHeight());
         Bitmap qr = generate(bcData.getUriString(), size, size);
         if (qr != null) {

app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java

@@ -73,14 +73,7 @@ public class ScannerFragment extends Fragment implements ZXingScannerView.Result
         // * On older devices continuously stopping and resuming camera preview can result in freezing the app.
         // * I don't know why this is the case but I don't have the time to figure out.
         Handler handler = new Handler();
-        handler.postDelayed(new
-
-                                    Runnable() {
-                                        @Override
-                                        public void run() {
-                                            mScannerView.resumeCameraPreview(ScannerFragment.this);
-                                        }
-                                    }, 2000);
+        handler.postDelayed(() -> mScannerView.resumeCameraPreview(ScannerFragment.this), 2000);
     }
 
     @Override

app/src/main/java/com/m2049r/xmrwallet/TxFragment.java

@@ -16,8 +16,11 @@
 
 package com.m2049r.xmrwallet;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Paint;
+import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
 import android.view.LayoutInflater;
@@ -25,6 +28,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -77,6 +81,9 @@ public class TxFragment extends Fragment {
     private TextView tvTxXmrToKey;
     private TextView tvDestinationBtc;
     private TextView tvTxAmountBtc;
+    private TextView tvXmrToSupport;
+    private TextView tvXmrToKeyLabel;
+    private ImageView tvXmrToLogo;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -88,6 +95,9 @@ public class TxFragment extends Fragment {
         tvTxXmrToKey = view.findViewById(R.id.tvTxXmrToKey);
         tvDestinationBtc = view.findViewById(R.id.tvDestinationBtc);
         tvTxAmountBtc = view.findViewById(R.id.tvTxAmountBtc);
+        tvXmrToSupport = view.findViewById(R.id.tvXmrToSupport);
+        tvXmrToKeyLabel = view.findViewById(R.id.tvXmrToKeyLabel);
+        tvXmrToLogo = view.findViewById(R.id.tvXmrToLogo);
 
         tvAccount = view.findViewById(R.id.tvAccount);
         tvAddress = view.findViewById(R.id.tvAddress);
@@ -104,12 +114,9 @@ public class TxFragment extends Fragment {
 
         etTxNotes.setRawInputType(InputType.TYPE_CLASS_TEXT);
 
-        tvTxXmrToKey.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
-                Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
-            }
+        tvTxXmrToKey.setOnClickListener(v -> {
+            Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
+            Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
         });
 
         Bundle args = getArguments();
@@ -283,12 +290,36 @@ public class TxFragment extends Fragment {
         showBtcInfo();
     }
 
+    @SuppressLint("SetTextI18n")
     void showBtcInfo() {
         if (userNotes.xmrtoKey != null) {
             cvXmrTo.setVisibility(View.VISIBLE);
-            tvTxXmrToKey.setText(userNotes.xmrtoKey);
+            String key = userNotes.xmrtoKey;
+            if ("xmrto".equals(userNotes.xmrtoTag)) { // legacy xmr.to service :(
+                key = "xmrto-" + key;
+            }
+            tvTxXmrToKey.setText(key);
             tvDestinationBtc.setText(userNotes.xmrtoDestination);
-            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " BTC");
+            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " "+ userNotes.xmrtoCurrency);
+            switch (userNotes.xmrtoTag) {
+                case "xmrto":
+                    tvXmrToSupport.setVisibility(View.GONE);
+                    tvXmrToKeyLabel.setVisibility(View.INVISIBLE);
+                    tvXmrToLogo.setImageResource(R.drawable.ic_xmrto_logo);
+                    break;
+                case "side": // defaults in layout - just add underline
+                    tvXmrToSupport.setPaintFlags(tvXmrToSupport.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+                    tvXmrToSupport.setOnClickListener(v -> {
+                        Uri uri = Uri.parse("https://sideshift.ai/orders/" + userNotes.xmrtoKey);
+                        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                        startActivity(intent);
+                    });
+                    break;
+                default:
+                    tvXmrToSupport.setVisibility(View.GONE);
+                    tvXmrToKeyLabel.setVisibility(View.INVISIBLE);
+                    tvXmrToLogo.setVisibility(View.GONE);
+            }
         } else {
             cvXmrTo.setVisibility(View.GONE);
         }

app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java

@@ -921,7 +921,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
     @Override
     public boolean onScanned(String qrCode) {
         // #gurke
-        BarcodeData bcData = BarcodeData.fromQrCode(qrCode);
+        BarcodeData bcData = BarcodeData.fromString(qrCode);
         if (bcData != null) {
             popFragmentStack(null);
             Timber.d("AAA");

app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java

@@ -49,6 +49,7 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
 import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.ServiceHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.NumberFormat;
@@ -242,7 +243,7 @@ public class WalletFragment extends Fragment
     String balanceCurrency = Helper.BASE_CRYPTO;
     double balanceRate = 1.0;
 
-    private final ExchangeApi exchangeApi = Helper.getExchangeApi();
+    private final ExchangeApi exchangeApi = ServiceHelper.getExchangeApi();
 
     void refreshBalance() {
         double unconfirmedXmr = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue();

app/src/main/java/com/m2049r/xmrwallet/XmrWalletApplication.java

@@ -16,14 +16,13 @@
 
 package com.m2049r.xmrwallet;
 
-
 import android.app.Application;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
 
+import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.model.NetworkType;
-import com.m2049r.xmrwallet.util.DayNightMode;
 import com.m2049r.xmrwallet.util.LocaleHelper;
 import com.m2049r.xmrwallet.util.NightmodeHelper;
 

app/src/main/java/com/m2049r/xmrwallet/data/Crypto.java

@@ -0,0 +1,89 @@
+package com.m2049r.xmrwallet.data;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.validator.BitcoinAddressType;
+import com.m2049r.xmrwallet.util.validator.BitcoinAddressValidator;
+import com.m2049r.xmrwallet.util.validator.EthAddressValidator;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum Crypto {
+    XMR("XMR", true, "monero:tx_amount:recipient_name:tx_description", R.id.ibXMR, R.drawable.ic_monero, R.drawable.ic_monero_bw, Wallet::isAddressValid),
+    BTC("BTC", true, "bitcoin:amount:label:message", R.id.ibBTC, R.drawable.ic_xmrto_btc, R.drawable.ic_xmrto_btc_off, address -> {
+        return BitcoinAddressValidator.validate(address, BitcoinAddressType.BTC);
+    }),
+    DASH("DASH", true, "dash:amount:label:message", R.id.ibDASH, R.drawable.ic_xmrto_dash, R.drawable.ic_xmrto_dash_off, address -> {
+        return BitcoinAddressValidator.validate(address, BitcoinAddressType.DASH);
+    }),
+    DOGE("DOGE", true, "dogecoin:amount:label:message", R.id.ibDOGE, R.drawable.ic_xmrto_doge, R.drawable.ic_xmrto_doge_off, address -> {
+        return BitcoinAddressValidator.validate(address, BitcoinAddressType.DOGE);
+    }),
+    ETH("ETH", false, "ethereum:amount:label:message", R.id.ibETH, R.drawable.ic_xmrto_eth, R.drawable.ic_xmrto_eth_off, EthAddressValidator::validate),
+    LTC("LTC", true, "litecoin:amount:label:message", R.id.ibLTC, R.drawable.ic_xmrto_ltc, R.drawable.ic_xmrto_ltc_off, address -> {
+        return BitcoinAddressValidator.validate(address, BitcoinAddressType.LTC);
+    });
+
+    @Getter
+    @NonNull
+    private final String symbol;
+    @Getter
+    private final boolean casefull;
+    @NonNull
+    private final String uriSpec;
+    @Getter
+    private final int buttonId;
+    @Getter
+    private final int iconEnabledId;
+    @Getter
+    private final int iconDisabledId;
+    @NonNull
+    private final Validator validator;
+
+    @Nullable
+    public static Crypto withScheme(@NonNull String scheme) {
+        for (Crypto crypto : values()) {
+            if (crypto.getUriScheme().equals(scheme)) return crypto;
+        }
+        return null;
+    }
+
+    @Nullable
+    public static Crypto withSymbol(@NonNull String symbol) {
+        final String upperSymbol = symbol.toUpperCase();
+        for (Crypto crypto : values()) {
+            if (crypto.symbol.equals(upperSymbol)) return crypto;
+        }
+        return null;
+    }
+
+    interface Validator {
+        boolean validate(String address);
+    }
+
+    // TODO maybe cache these segments
+    String getUriScheme() {
+        return uriSpec.split(":")[0];
+    }
+
+    String getUriAmount() {
+        return uriSpec.split(":")[1];
+    }
+
+    String getUriLabel() {
+        return uriSpec.split(":")[2];
+    }
+
+    String getUriMessage() {
+        return uriSpec.split(":")[3];
+    }
+
+    boolean validate(String address) {
+        return validator.validate(address);
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/data/DefaultNodes.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.m2049r.xmrwallet.data;
 
 import lombok.AllArgsConstructor;

app/src/main/java/com/m2049r/xmrwallet/data/TxData.java

@@ -20,6 +20,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.m2049r.xmrwallet.model.PendingTransaction;
+import com.m2049r.xmrwallet.model.Wallet;
 
 // https://stackoverflow.com/questions/2139134/how-to-send-an-object-from-one-android-activity-to-another-using-intents
 public class TxData implements Parcelable {
@@ -52,6 +53,10 @@ public class TxData implements Parcelable {
         return amount;
     }
 
+    public double getAmountAsDouble() {
+        return 1.0 * amount / 1000000000000L;
+    }
+
     public int getMixin() {
         return mixin;
     }
@@ -68,6 +73,10 @@ public class TxData implements Parcelable {
         this.amount = amount;
     }
 
+    public void setAmount(double amount) {
+        this.amount = Wallet.getAmountFromDouble(amount);
+    }
+
     public void setMixin(int mixin) {
         this.mixin = mixin;
     }

app/src/main/java/com/m2049r/xmrwallet/data/TxDataBtc.java

@@ -18,11 +18,23 @@ package com.m2049r.xmrwallet.data;
 
 import android.os.Parcel;
 
-public class TxDataBtc extends TxData {
+import androidx.annotation.NonNull;
 
-    private String xmrtoUuid;
+import lombok.Getter;
+import lombok.Setter;
+
+public class TxDataBtc extends TxData {
+    @Getter
+    @Setter
+    private String btcSymbol; // the actual non-XMR thing we're sending
+    @Getter
+    @Setter
+    private String xmrtoOrderId; // shown in success screen
+    @Getter
+    @Setter
     private String btcAddress;
-    private String bip70;
+    @Getter
+    @Setter
     private double btcAmount;
 
     public TxDataBtc() {
@@ -33,44 +45,12 @@ public class TxDataBtc extends TxData {
         super(txDataBtc);
     }
 
-    public String getXmrtoUuid() {
-        return xmrtoUuid;
-    }
-
-    public void setXmrtoUuid(String xmrtoUuid) {
-        this.xmrtoUuid = xmrtoUuid;
-    }
-
-    public String getBtcAddress() {
-        return btcAddress;
-    }
-
-    public void setBtcAddress(String btcAddress) {
-        this.btcAddress = btcAddress;
-    }
-
-    public String getBip70() {
-        return bip70;
-    }
-
-    public void setBip70(String bip70) {
-        this.bip70 = bip70;
-    }
-
-    public double getBtcAmount() {
-        return btcAmount;
-    }
-
-    public void setBtcAmount(double btcAmount) {
-        this.btcAmount = btcAmount;
-    }
-
     @Override
     public void writeToParcel(Parcel out, int flags) {
         super.writeToParcel(out, flags);
-        out.writeString(xmrtoUuid);
+        out.writeString(btcSymbol);
+        out.writeString(xmrtoOrderId);
         out.writeString(btcAddress);
-        out.writeString(bip70);
         out.writeDouble(btcAmount);
     }
 
@@ -87,23 +67,35 @@ public class TxDataBtc extends TxData {
 
     protected TxDataBtc(Parcel in) {
         super(in);
-        xmrtoUuid = in.readString();
+        btcSymbol = in.readString();
+        xmrtoOrderId = in.readString();
         btcAddress = in.readString();
-        bip70 = in.readString();
         btcAmount = in.readDouble();
     }
 
+    @NonNull
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append(",xmrtoUuid:");
-        sb.append(xmrtoUuid);
+        sb.append("xmrtoOrderId:");
+        sb.append(xmrtoOrderId);
+        sb.append(",btcSymbol:");
+        sb.append(btcSymbol);
         sb.append(",btcAddress:");
         sb.append(btcAddress);
-        sb.append(",bip70:");
-        sb.append(bip70);
         sb.append(",btcAmount:");
         sb.append(btcAmount);
         return sb.toString();
     }
+
+    public boolean validateAddress(@NonNull String address) {
+        if ((btcSymbol == null) || (btcAddress == null)) return false;
+        final Crypto crypto = Crypto.withSymbol(btcSymbol);
+        if (crypto == null) return false;
+        if (crypto.isCasefull()) { // compare as-is
+            return address.equals(btcAddress);
+        } else { // normalize & compare (e.g. ETH with and without checksum capitals
+            return address.toLowerCase().equals(btcAddress.toLowerCase());
+        }
+    }
 }

app/src/main/java/com/m2049r/xmrwallet/data/UserNotes.java

@@ -16,18 +16,19 @@
 
 package com.m2049r.xmrwallet.data;
 
-import com.m2049r.xmrwallet.xmrto.api.QueryOrderStatus;
+import com.m2049r.xmrwallet.service.shift.sideshift.api.CreateOrder;
+import com.m2049r.xmrwallet.util.Helper;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import timber.log.Timber;
-
 public class UserNotes {
     public String txNotes = "";
     public String note = "";
+    public String xmrtoTag = null;
     public String xmrtoKey = null;
     public String xmrtoAmount = null; // could be a double - but we are not doing any calculations
+    public String xmrtoCurrency = null;
     public String xmrtoDestination = null;
 
     public UserNotes(final String txNotes) {
@@ -35,13 +36,15 @@ public class UserNotes {
             return;
         }
         this.txNotes = txNotes;
-        Pattern p = Pattern.compile("^\\{(xmrto-\\w{6}),([0-9.]*)BTC,(\\w*)\\} ?(.*)");
+        Pattern p = Pattern.compile("^\\{([a-z]+)-(\\w{6,}),([0-9.]*)([A-Z]+),(\\w*)\\} ?(.*)");
         Matcher m = p.matcher(txNotes);
         if (m.find()) {
-            xmrtoKey = m.group(1);
-            xmrtoAmount = m.group(2);
-            xmrtoDestination = m.group(3);
-            note = m.group(4);
+            xmrtoTag = m.group(1);
+            xmrtoKey = m.group(2);
+            xmrtoAmount = m.group(3);
+            xmrtoCurrency = m.group(4);
+            xmrtoDestination = m.group(5);
+            note = m.group(6);
         } else {
             note = txNotes;
         }
@@ -56,12 +59,15 @@ public class UserNotes {
         txNotes = buildTxNote();
     }
 
-    public void setXmrtoStatus(QueryOrderStatus xmrtoStatus) {
-        if (xmrtoStatus != null) {
-            xmrtoKey = xmrtoStatus.getUuid();
-            xmrtoAmount = String.valueOf(xmrtoStatus.getBtcAmount());
-            xmrtoDestination = xmrtoStatus.getBtcDestAddress();
+    public void setXmrtoOrder(CreateOrder order) {
+        if (order != null) {
+            xmrtoTag = order.TAG;
+            xmrtoKey = order.getOrderId();
+            xmrtoAmount = Helper.getDisplayAmount(order.getBtcAmount());
+            xmrtoCurrency = order.getBtcCurrency();
+            xmrtoDestination = order.getBtcAddress();
         } else {
+            xmrtoTag = null;
             xmrtoKey = null;
             xmrtoAmount = null;
             xmrtoDestination = null;
@@ -70,15 +76,18 @@ public class UserNotes {
     }
 
     private String buildTxNote() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         if (xmrtoKey != null) {
             if ((xmrtoAmount == null) || (xmrtoDestination == null))
                 throw new IllegalArgumentException("Broken notes");
             sb.append("{");
+            sb.append(xmrtoTag);
+            sb.append("-");
             sb.append(xmrtoKey);
             sb.append(",");
             sb.append(xmrtoAmount);
-            sb.append("BTC,");
+            sb.append(xmrtoCurrency);
+            sb.append(",");
             sb.append(xmrtoDestination);
             sb.append("}");
             if ((note != null) && (!note.isEmpty()))

app/src/main/java/com/m2049r/xmrwallet/dialog/ProgressDialog.java

@@ -27,7 +27,6 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
-import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.util.Helper;
 

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAmountWizardFragment.java

@@ -42,9 +42,8 @@ public class SendAmountWizardFragment extends SendWizardFragment {
 
     Listener sendListener;
 
-    public SendAmountWizardFragment setSendListener(Listener listener) {
+    public void setSendListener(Listener listener) {
         this.sendListener = listener;
-        return this;
     }
 
     interface Listener {

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcSuccessWizardFragment.java

@@ -16,6 +16,9 @@
 
 package com.m2049r.xmrwallet.fragment.send;
 
+import android.content.Intent;
+import android.graphics.Paint;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,15 +30,17 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.data.PendingTx;
 import com.m2049r.xmrwallet.data.TxDataBtc;
+import com.m2049r.xmrwallet.service.shift.ShiftCallback;
+import com.m2049r.xmrwallet.service.shift.ShiftException;
+import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderStatus;
+import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi;
+import com.m2049r.xmrwallet.service.shift.sideshift.network.SideShiftApiImpl;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.OkHttpHelper;
-import com.m2049r.xmrwallet.xmrto.XmrToException;
-import com.m2049r.xmrwallet.xmrto.api.QueryOrderStatus;
-import com.m2049r.xmrwallet.xmrto.api.XmrToApi;
-import com.m2049r.xmrwallet.xmrto.api.XmrToCallback;
-import com.m2049r.xmrwallet.xmrto.network.XmrToApiImpl;
+import com.m2049r.xmrwallet.util.ServiceHelper;
 
 import java.text.NumberFormat;
 import java.util.Locale;
@@ -52,23 +57,23 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
 
     SendSuccessWizardFragment.Listener sendListener;
 
-    public SendBtcSuccessWizardFragment setSendListener(SendSuccessWizardFragment.Listener listener) {
+    public void setSendListener(SendSuccessWizardFragment.Listener listener) {
         this.sendListener = listener;
-        return this;
     }
 
     ImageButton bCopyTxId;
     private TextView tvTxId;
     private TextView tvTxAddress;
-    private TextView tvTxPaymentId;
     private TextView tvTxAmount;
     private TextView tvTxFee;
     private TextView tvXmrToAmount;
+    private ImageView ivXmrToIcon;
     private TextView tvXmrToStatus;
     private ImageView ivXmrToStatus;
     private ImageView ivXmrToStatusBig;
     private ProgressBar pbXmrto;
     private TextView tvTxXmrToKey;
+    private TextView tvXmrToSupport;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -87,13 +92,13 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
         });
 
         tvXmrToAmount = view.findViewById(R.id.tvXmrToAmount);
+        ivXmrToIcon = view.findViewById(R.id.ivXmrToIcon);
         tvXmrToStatus = view.findViewById(R.id.tvXmrToStatus);
         ivXmrToStatus = view.findViewById(R.id.ivXmrToStatus);
         ivXmrToStatusBig = view.findViewById(R.id.ivXmrToStatusBig);
 
         tvTxId = view.findViewById(R.id.tvTxId);
         tvTxAddress = view.findViewById(R.id.tvTxAddress);
-        tvTxPaymentId = view.findViewById(R.id.tvTxPaymentId);
         tvTxAmount = view.findViewById(R.id.tvTxAmount);
         tvTxFee = view.findViewById(R.id.tvTxFee);
 
@@ -101,14 +106,14 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
         pbXmrto.getIndeterminateDrawable().setColorFilter(0x61000000, android.graphics.PorterDuff.Mode.MULTIPLY);
 
         tvTxXmrToKey = view.findViewById(R.id.tvTxXmrToKey);
-        tvTxXmrToKey.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
-                Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
-            }
+        tvTxXmrToKey.setOnClickListener(v -> {
+            Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_xmrtokey), tvTxXmrToKey.getText().toString());
+            Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
         });
 
+        tvXmrToSupport = view.findViewById(R.id.tvXmrToSupport);
+        tvXmrToSupport.setPaintFlags(tvXmrToSupport.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+
         return view;
     }
 
@@ -147,9 +152,16 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
                 NumberFormat df = NumberFormat.getInstance(Locale.US);
                 df.setMaximumFractionDigits(12);
                 String btcAmount = df.format(btcData.getBtcAmount());
-                tvXmrToAmount.setText(getString(R.string.info_send_xmrto_success_btc, btcAmount));
+                tvXmrToAmount.setText(getString(R.string.info_send_xmrto_success_btc, btcAmount, btcData.getBtcSymbol()));
                 //TODO         btcData.getBtcAddress();
-                tvTxXmrToKey.setText(btcData.getXmrtoUuid());
+                tvTxXmrToKey.setText(btcData.getXmrtoOrderId());
+                final Crypto crypto = Crypto.withSymbol(btcData.getBtcSymbol());
+                ivXmrToIcon.setImageResource(crypto.getIconEnabledId());
+                tvXmrToSupport.setOnClickListener(v -> {
+                    Uri orderUri = getXmrToApi().getQueryOrderUri(btcData.getXmrtoOrderId());
+                    Intent intent = new Intent(Intent.ACTION_VIEW, orderUri);
+                    startActivity(intent);
+                });
                 queryOrder();
             } else {
                 throw new IllegalStateException("btcData is null");
@@ -158,33 +170,23 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
         sendListener.enableDone();
     }
 
-    private final int QUERY_INTERVAL = 1000; // ms
-
     private void processQueryOrder(final QueryOrderStatus status) {
-        Timber.d("processQueryOrder %s for %s", status.getState().toString(), status.getUuid());
-        if (!btcData.getXmrtoUuid().equals(status.getUuid()))
+        Timber.d("processQueryOrder %s for %s", status.getState().toString(), status.getOrderId());
+        if (!btcData.getXmrtoOrderId().equals(status.getOrderId()))
             throw new IllegalStateException("UUIDs do not match!");
         if (isResumed && (getView() != null))
-            getView().post(new Runnable() {
-                @Override
-                public void run() {
-                    showXmrToStatus(status);
-                    if (!status.isTerminal()) {
-                        getView().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                queryOrder();
-                            }
-                        }, QUERY_INTERVAL);
-                    }
+            getView().post(() -> {
+                showXmrToStatus(status);
+                if (!status.isTerminal()) {
+                    getView().postDelayed(this::queryOrder, SideShiftApi.QUERY_INTERVAL);
                 }
             });
     }
 
     private void queryOrder() {
-        Timber.d("queryOrder(%s)", btcData.getXmrtoUuid());
+        Timber.d("queryOrder(%s)", btcData.getXmrtoOrderId());
         if (!isResumed) return;
-        getXmrToApi().queryOrderStatus(btcData.getXmrtoUuid(), new XmrToCallback<QueryOrderStatus>() {
+        getXmrToApi().queryOrderStatus(btcData.getXmrtoOrderId(), new ShiftCallback<QueryOrderStatus>() {
             @Override
             public void onSuccess(QueryOrderStatus status) {
                 if (!isAdded()) return;
@@ -194,38 +196,34 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
             @Override
             public void onError(final Exception ex) {
                 if (!isResumed) return;
-                Timber.e(ex);
-                getActivity().runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (ex instanceof XmrToException) {
-                            Toast.makeText(getActivity(), ((XmrToException) ex).getError().getErrorMsg(), Toast.LENGTH_LONG).show();
-                        } else {
-                            Toast.makeText(getActivity(), ex.getLocalizedMessage(), Toast.LENGTH_LONG).show();
-                        }
+                Timber.w(ex);
+                getActivity().runOnUiThread(() -> {
+                    if (ex instanceof ShiftException) {
+                        Toast.makeText(getActivity(), ((ShiftException) ex).getError().getErrorMsg(), Toast.LENGTH_LONG).show();
+                    } else {
+                        Toast.makeText(getActivity(), ex.getLocalizedMessage(), Toast.LENGTH_LONG).show();
                     }
                 });
             }
         });
     }
 
-    private int statusResource = 0;
-
     void showXmrToStatus(final QueryOrderStatus status) {
+        int statusResource = 0;
         if (status.isError()) {
             tvXmrToStatus.setText(getString(R.string.info_send_xmrto_error, status.toString()));
             statusResource = R.drawable.ic_error_red_24dp;
             pbXmrto.getIndeterminateDrawable().setColorFilter(0xff8b0000, android.graphics.PorterDuff.Mode.MULTIPLY);
-        } else if (status.isSent()) {
-            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_sent));
+        } else if (status.isSent() || status.isPaid()) {
+            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_sent, btcData.getBtcSymbol()));
             statusResource = R.drawable.ic_success_green_24dp;
             pbXmrto.getIndeterminateDrawable().setColorFilter(0xFF417505, android.graphics.PorterDuff.Mode.MULTIPLY);
+        } else if (status.isWaiting()) {
+            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_unpaid));
+            statusResource = R.drawable.ic_pending_orange_24dp;
+            pbXmrto.getIndeterminateDrawable().setColorFilter(0xFFFF6105, android.graphics.PorterDuff.Mode.MULTIPLY);
         } else if (status.isPending()) {
-            if (status.isPaid()) {
-                tvXmrToStatus.setText(getString(R.string.info_send_xmrto_paid));
-            } else {
-                tvXmrToStatus.setText(getString(R.string.info_send_xmrto_unpaid));
-            }
+            tvXmrToStatus.setText(getString(R.string.info_send_xmrto_paid));
             statusResource = R.drawable.ic_pending_orange_24dp;
             pbXmrto.getIndeterminateDrawable().setColorFilter(0xFFFF6105, android.graphics.PorterDuff.Mode.MULTIPLY);
         } else {
@@ -234,20 +232,21 @@ public class SendBtcSuccessWizardFragment extends SendWizardFragment {
         ivXmrToStatus.setImageResource(statusResource);
         if (status.isTerminal()) {
             pbXmrto.setVisibility(View.INVISIBLE);
+            ivXmrToIcon.setVisibility(View.GONE);
             ivXmrToStatus.setVisibility(View.GONE);
             ivXmrToStatusBig.setImageResource(statusResource);
             ivXmrToStatusBig.setVisibility(View.VISIBLE);
         }
     }
 
-    private XmrToApi xmrToApi = null;
+    private SideShiftApi xmrToApi = null;
 
-    private final XmrToApi getXmrToApi() {
+    private SideShiftApi getXmrToApi() {
         if (xmrToApi == null) {
             synchronized (this) {
                 if (xmrToApi == null) {
-                    xmrToApi = new XmrToApiImpl(OkHttpHelper.getOkHttpClient(),
-                            Helper.getXmrToBaseUrl());
+                    xmrToApi = new SideShiftApiImpl(OkHttpHelper.getOkHttpClient(),
+                            ServiceHelper.getXmrToBaseUrl());
                 }
             }
         }

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java

@@ -29,6 +29,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -92,8 +93,6 @@ public class SendFragment extends Fragment
         void setOnUriScannedListener(OnUriScannedListener onUriScannedListener);
     }
 
-    private EditText etDummy;
-
     private View llNavBar;
     private DotBar dotBar;
     private Button bPrev;
@@ -101,7 +100,7 @@ public class SendFragment extends Fragment
 
     private Button bDone;
 
-    static private int MAX_FALLBACK = Integer.MAX_VALUE;
+    static private final int MAX_FALLBACK = Integer.MAX_VALUE;
 
     public static SendFragment newInstance(String uri) {
         SendFragment f = new SendFragment();
@@ -166,28 +165,18 @@ public class SendFragment extends Fragment
             }
         });
 
-        bPrev.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                spendViewPager.previous();
-            }
-        });
+        bPrev.setOnClickListener(v -> spendViewPager.previous());
 
-        bNext.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                spendViewPager.next();
-            }
-        });
+        bNext.setOnClickListener(v -> spendViewPager.next());
 
-        bDone.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                Timber.d("bDone.onClick");
-                activityCallback.onFragmentDone();
-            }
+        bDone.setOnClickListener(v -> {
+            Timber.d("bDone.onClick");
+            activityCallback.onFragmentDone();
         });
 
         updatePosition(0);
 
-        etDummy = view.findViewById(R.id.etDummy);
+        final EditText etDummy = view.findViewById(R.id.etDummy);
         etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         etDummy.requestFocus();
         Helper.hideKeyboard(getActivity());
@@ -197,7 +186,7 @@ public class SendFragment extends Fragment
             String uri = args.getString(WalletActivity.REQUEST_URI);
             Timber.d("URI: %s", uri);
             if (uri != null) {
-                barcodeData = BarcodeData.fromQrCode(uri);
+                barcodeData = BarcodeData.fromString(uri);
                 Timber.d("barcodeData: %s", barcodeData != null ? barcodeData.toString() : "null");
             }
         }
@@ -236,7 +225,7 @@ public class SendFragment extends Fragment
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         Timber.d("onAttach %s", context);
         super.onAttach(context);
         if (context instanceof Listener) {
@@ -300,12 +289,7 @@ public class SendFragment extends Fragment
                 default:
                     throw new IllegalArgumentException("Mode " + String.valueOf(aMode) + " unknown!");
             }
-            getView().post(new Runnable() {
-                @Override
-                public void run() {
-                    pagerAdapter.notifyDataSetChanged();
-                }
-            });
+            getView().post(() -> pagerAdapter.notifyDataSetChanged());
             Timber.d("New Mode = %s", mode.toString());
         }
     }
@@ -338,8 +322,9 @@ public class SendFragment extends Fragment
             return numPages;
         }
 
+        @NonNull
         @Override
-        public Object instantiateItem(ViewGroup container, int position) {
+        public Object instantiateItem(@NonNull ViewGroup container, int position) {
             Timber.d("instantiateItem %d", position);
             SendWizardFragment fragment = (SendWizardFragment) super.instantiateItem(container, position);
             myFragments.put(position, new WeakReference<>(fragment));
@@ -347,20 +332,21 @@ public class SendFragment extends Fragment
         }
 
         @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
+        public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
             Timber.d("destroyItem %d", position);
             myFragments.remove(position);
             super.destroyItem(container, position, object);
         }
 
         public SendWizardFragment getFragment(int position) {
-            WeakReference ref = myFragments.get(position);
+            WeakReference<SendWizardFragment> ref = myFragments.get(position);
             if (ref != null)
                 return myFragments.get(position).get();
             else
                 return null;
         }
 
+        @NonNull
         @Override
         public SendWizardFragment getItem(int position) {
             Timber.d("getItem(%d) CREATE", position);
@@ -415,7 +401,7 @@ public class SendFragment extends Fragment
         }
 
         @Override
-        public int getItemPosition(Object object) {
+        public int getItemPosition(@NonNull Object object) {
             Timber.d("getItemPosition %s", String.valueOf(object));
             if (object instanceof SendAddressWizardFragment) {
                 // keep these pages
@@ -563,22 +549,4 @@ public class SendFragment extends Fragment
         inflater.inflate(R.menu.send_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }
-
-    // xmr.to info box
-    private static final String PREF_SHOW_XMRTO_ENABLED = "info_xmrto_enabled_send";
-
-    boolean showXmrtoEnabled = true;
-
-    void loadPrefs() {
-        SharedPreferences sharedPref = activityCallback.getPrefs();
-        showXmrtoEnabled = sharedPref.getBoolean(PREF_SHOW_XMRTO_ENABLED, true);
-    }
-
-    void saveXmrToPrefs() {
-        SharedPreferences sharedPref = activityCallback.getPrefs();
-        SharedPreferences.Editor editor = sharedPref.edit();
-        editor.putBoolean(PREF_SHOW_XMRTO_ENABLED, showXmrtoEnabled);
-        editor.apply();
-    }
-
 }

app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java

@@ -17,18 +17,20 @@
 package com.m2049r.xmrwallet.layout;
 
 import android.content.Context;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.data.Crypto;
+import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.util.Helper;
-import com.m2049r.xmrwallet.data.UserNotes;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -141,7 +143,13 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
 
             UserNotes userNotes = new UserNotes(infoItem.notes);
             if (userNotes.xmrtoKey != null) {
-                ivTxType.setVisibility(View.VISIBLE);
+                final Crypto crypto = Crypto.withSymbol(userNotes.xmrtoCurrency);
+                if (crypto != null) {
+                    ivTxType.setImageResource(crypto.getIconEnabledId());
+                    ivTxType.setVisibility(View.VISIBLE);
+                } else {// otherwirse pretend we don't know it's a shift
+                    ivTxType.setVisibility(View.GONE);
+                }
             } else {
                 ivTxType.setVisibility(View.GONE); // gives us more space for the amount
             }

app/src/main/java/com/m2049r/xmrwallet/ledger/Ledger.java

@@ -2,7 +2,7 @@
  *******************************************************************************
  *   BTChip Bitcoin Hardware Wallet Java API
  *   (c) 2014 BTChip - 1BTChip7VfTnrPra5jqci7ejnMguuHogTn
- *   (c) m2049r
+ *   Copyright (c) 2018 m2049r
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.

app/src/main/java/com/m2049r/xmrwallet/ledger/LedgerProgressDialog.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2018 m2049r
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.m2049r.xmrwallet.ledger;
 
 import android.content.Context;

app/src/main/java/com/m2049r/xmrwallet/service/shift/NetworkCallback.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.xmrto.network;
+package com.m2049r.xmrwallet.service.shift;
 
 import org.json.JSONObject;
 
-interface NetworkCallback {
+public interface NetworkCallback {
 
     void onSuccess(JSONObject jsonObject);
 

app/src/main/java/com/m2049r/xmrwallet/service/shift/ShiftApiCall.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.xmrto.network;
+package com.m2049r.xmrwallet.service.shift;
 
 import androidx.annotation.NonNull;
 
 import org.json.JSONObject;
 
-interface XmrToApiCall {
+public interface ShiftApiCall {
 
     void call(@NonNull final String path, @NonNull final NetworkCallback callback);
 

app/src/main/java/com/m2049r/xmrwallet/service/shift/ShiftCallback.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.xmrto.api;
+package com.m2049r.xmrwallet.service.shift;
 
-public interface XmrToCallback<T> {
+public interface ShiftCallback<T> {
 
     void onSuccess(T t);
 

app/src/main/java/com/m2049r/xmrwallet/service/shift/ShiftError.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017-2021 m2049r et al.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.service.shift;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class ShiftError {
+    @Getter
+    private final Error errorType;
+    @Getter
+    private final String errorMsg;
+
+    public enum Error {
+        SERVICE,
+        INFRASTRUCTURE
+    }
+
+    public boolean isRetryable() {
+        return errorType == Error.INFRASTRUCTURE;
+    }
+
+    public ShiftError(final JSONObject jsonObject) throws JSONException {
+        final JSONObject errorObject = jsonObject.getJSONObject("error");
+        errorType = Error.SERVICE;
+        errorMsg = errorObject.getString("message");
+    }
+
+    @Override
+    @NonNull
+    public String toString() {
+        return getErrorMsg();
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/service/shift/ShiftException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 m2049r et al.
+ * Copyright (c) 2017-2021 m2049r et al.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,29 +14,20 @@
  * limitations under the License.
  */
 
-package com.m2049r.xmrwallet.xmrto;
+package com.m2049r.xmrwallet.service.shift;
 
-public class XmrToException extends Exception {
-    private int code;
-    private XmrToError error;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
-    public XmrToException(final int code) {
-        super();
+@RequiredArgsConstructor
+public class ShiftException extends Exception {
+    @Getter
+    private final int code;
+    @Getter
+    private final ShiftError error;
+
+    public ShiftException(int code) {
         this.code = code;
         this.error = null;
     }
-
-    public XmrToException(final int code, final XmrToError error) {
-        super();
-        this.code = code;
-        this.error = error;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public XmrToError getError() {
-        return error;
-    }
 }

app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/api/CreateOrder.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2017-2021 m2049r et al.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.service.shift.sideshift.api;
+
+import java.util.Date;
+
+public interface CreateOrder {
+    String TAG = "side";
+
+    String getBtcCurrency();
+
+    double getBtcAmount();
+
+    String getBtcAddress();
+
+    String getQuoteId();
+
+    String getOrderId();
+
+    double getXmrAmount();
+
+    String getXmrAddress();
+
+    Date getCreatedAt(); // createdAt
+
+    Date getExpiresAt(); // expiresAt
+
+}