bump version

* Ru update

* Better external libs build guide

* Update BUILDING-external-libs.md

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion '29.0.3'
     defaultConfig {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 712
-        versionName "1.17.12 'Druk'"
+        targetSdkVersion 30
+        versionCode 1003
+        versionName "2.0.3 'Puginarug'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -123,7 +123,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     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.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

app/src/main/AndroidManifest.xml

@@ -4,16 +4,14 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:requestLegacyExternalStorage="true"
+        android:preserveLegacyExternalStorage="true"
         android:name=".XmrWalletApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"

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

@@ -31,10 +31,11 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
+import android.widget.Toast;
+
 import androidx.annotation.CallSuper;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import android.widget.Toast;
 
 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.dialog.ProgressDialog;
@@ -46,7 +47,8 @@ import java.io.IOException;
 
 import timber.log.Timber;
 
-public class BaseActivity extends SecureActivity implements GenerateReviewFragment.ProgressListener {
+public class BaseActivity extends SecureActivity
+        implements GenerateReviewFragment.ProgressListener, SubaddressFragment.ProgressListener {
 
     ProgressDialog progressDialog = null;
 

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

@@ -307,7 +307,6 @@ public class GenerateReviewFragment extends Fragment {
         void dismissProgressDialog();
     }
 
-
     public interface AcceptListener {
         void onAccept(String name, String password);
     }

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

@@ -31,7 +31,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -62,8 +61,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
 
     private WalletInfoAdapter adapter;
 
-    private List<WalletManager.WalletInfo> walletList = new ArrayList<>();
-    private List<WalletManager.WalletInfo> displayedList = new ArrayList<>();
+    private final List<WalletManager.WalletInfo> walletList = new ArrayList<>();
 
     private View tvGuntherSays;
     private ImageView ivGunther;
@@ -82,13 +80,15 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
 
         void onWalletDetails(String wallet);
 
-        void onWalletReceive(String wallet);
-
         void onWalletRename(String name);
 
         void onWalletBackup(String name);
 
-        void onWalletArchive(String walletName);
+        void onWalletRestore();
+
+        void onWalletDelete(String walletName);
+
+        void onWalletDeleteCache(String walletName);
 
         void onAddWallet(String type);
 
@@ -112,7 +112,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         if (context instanceof Listener) {
             this.activityCallback = (Listener) context;
@@ -202,12 +202,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
     // Wallet touched
     @Override
     public void onInteraction(final View view, final WalletManager.WalletInfo infoItem) {
-        String addressPrefix = WalletManager.getInstance().addressPrefix();
-        if (addressPrefix.indexOf(infoItem.address.charAt(0)) < 0) {
-            Toast.makeText(getActivity(), getString(R.string.prompt_wrong_net), Toast.LENGTH_LONG).show();
-            return;
-        }
-        openWallet(infoItem.name, false);
+        openWallet(infoItem.getName(), false);
     }
 
     private void openWallet(String name, boolean streetmode) {
@@ -216,51 +211,34 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
 
     @Override
     public boolean onContextInteraction(MenuItem item, WalletManager.WalletInfo listItem) {
-        switch (item.getItemId()) {
-            case R.id.action_streetmode:
-                openWallet(listItem.name, true);
-                break;
-            case R.id.action_info:
-                showInfo(listItem.name);
-                break;
-            case R.id.action_receive:
-                showReceive(listItem.name);
-                break;
-            case R.id.action_rename:
-                activityCallback.onWalletRename(listItem.name);
-                break;
-            case R.id.action_backup:
-                activityCallback.onWalletBackup(listItem.name);
-                break;
-            case R.id.action_archive:
-                activityCallback.onWalletArchive(listItem.name);
-                break;
-            default:
-                return super.onContextItemSelected(item);
+        final int id = item.getItemId();
+        if (id == R.id.action_streetmode) {
+            openWallet(listItem.getName(), true);
+        } else if (id == R.id.action_info) {
+            showInfo(listItem.getName());
+        } else if (id == R.id.action_rename) {
+            activityCallback.onWalletRename(listItem.getName());
+        } else if (id == R.id.action_backup) {
+            activityCallback.onWalletBackup(listItem.getName());
+        } else if (id == R.id.action_archive) {
+            activityCallback.onWalletDelete(listItem.getName());
+        } else if (id == R.id.action_deletecache) {
+            activityCallback.onWalletDeleteCache(listItem.getName());
+        } else {
+            return super.onContextItemSelected(item);
         }
         return true;
     }
 
-    private void filterList() {
-        displayedList.clear();
-        String addressPrefix = WalletManager.getInstance().addressPrefix();
-        for (WalletManager.WalletInfo s : walletList) {
-            if (addressPrefix.indexOf(s.address.charAt(0)) >= 0) displayedList.add(s);
-        }
-    }
-
     public void loadList() {
         Timber.d("loadList()");
         WalletManager mgr = WalletManager.getInstance();
-        List<WalletManager.WalletInfo> walletInfos =
-                mgr.findWallets(activityCallback.getStorageRoot());
         walletList.clear();
-        walletList.addAll(walletInfos);
-        filterList();
-        adapter.setInfos(displayedList);
+        walletList.addAll(mgr.findWallets(activityCallback.getStorageRoot()));
+        adapter.setInfos(walletList);
 
         // deal with Gunther & FAB animation
-        if (displayedList.isEmpty()) {
+        if (walletList.isEmpty()) {
             fab.startAnimation(fab_pulse);
             if (ivGunther.getDrawable() == null) {
                 ivGunther.setImageResource(R.drawable.ic_emptygunther);
@@ -279,7 +257,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
                 .getSharedPreferences(KeyStoreHelper.SecurityConstants.WALLET_PASS_PREFS_NAME, Context.MODE_PRIVATE)
                 .getAll().keySet();
         for (WalletManager.WalletInfo s : walletList) {
-            removedWallets.remove(s.name);
+            removedWallets.remove(s.getName());
         }
         for (String name : removedWallets) {
             KeyStoreHelper.removeWalletUserPass(getActivity(), name);
@@ -290,10 +268,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
         activityCallback.onWalletDetails(name);
     }
 
-    private void showReceive(@NonNull String name) {
-        activityCallback.onWalletReceive(name);
-    }
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -301,7 +275,7 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.list_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }
@@ -371,37 +345,29 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
 
     @Override
     public void onClick(View v) {
-        int id = v.getId();
+        final int id = v.getId();
         Timber.d("onClick %d/%d", id, R.id.fabLedger);
-        switch (id) {
-            case R.id.fab:
-                animateFAB();
-                break;
-            case R.id.fabNew:
-                fabScreen.setVisibility(View.INVISIBLE);
-                isFabOpen = false;
-                activityCallback.onAddWallet(GenerateFragment.TYPE_NEW);
-                break;
-            case R.id.fabView:
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_VIEWONLY);
-                break;
-            case R.id.fabKey:
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_KEY);
-                break;
-            case R.id.fabSeed:
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_SEED);
-                break;
-            case R.id.fabLedger:
-                Timber.d("FAB_LEDGER");
-                animateFAB();
-                activityCallback.onAddWallet(GenerateFragment.TYPE_LEDGER);
-                break;
-            case R.id.fabScreen:
-                animateFAB();
-                break;
+        if (id == R.id.fab) {
+            animateFAB();
+        } else if (id == R.id.fabNew) {
+            fabScreen.setVisibility(View.INVISIBLE);
+            isFabOpen = false;
+            activityCallback.onAddWallet(GenerateFragment.TYPE_NEW);
+        } else if (id == R.id.fabView) {
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_VIEWONLY);
+        } else if (id == R.id.fabKey) {
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_KEY);
+        } else if (id == R.id.fabSeed) {
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_SEED);
+        } else if (id == R.id.fabLedger) {
+            Timber.d("FAB_LEDGER");
+            animateFAB();
+            activityCallback.onAddWallet(GenerateFragment.TYPE_LEDGER);
+        } else if (id == R.id.fabScreen) {
+            animateFAB();
         }
     }
 

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

@@ -228,24 +228,23 @@ public class NodeFragment extends Fragment
 
     // open up edit dialog
     @Override
-    public void onLongInteraction(final View view, final NodeInfo nodeItem) {
+    public boolean onLongInteraction(final View view, final NodeInfo nodeItem) {
         Timber.d("onLongInteraction");
         EditDialog diag = createEditDialog(nodeItem);
         if (diag != null) {
             diag.show();
         }
+        return true;
     }
 
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        switch (id) {
-            case R.id.fab:
-                EditDialog diag = createEditDialog(null);
-                if (diag != null) {
-                    diag.show();
-                }
-                break;
+        if (id == R.id.fab) {
+            EditDialog diag = createEditDialog(null);
+            if (diag != null) {
+                diag.show();
+            }
         }
     }
 

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 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;
+
+import com.m2049r.xmrwallet.model.Wallet;
+
+public interface OnBlockUpdateListener {
+    void onBlockUpdate(final Wallet wallet);
+}

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

@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2017 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;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.transition.MaterialElevationScale;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.SubaddressInfoAdapter;
+import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.model.WalletManager;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import timber.log.Timber;
+
+public class SubaddressFragment extends Fragment implements SubaddressInfoAdapter.OnInteractionListener,
+        View.OnClickListener, OnBlockUpdateListener {
+    static public final String KEY_MODE = "mode";
+    static public final String MODE_MANAGER = "manager";
+
+    private SubaddressInfoAdapter adapter;
+
+    private Listener activityCallback;
+
+    private Wallet wallet;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onSubaddressSelected(Subaddress subaddress);
+
+        void setSubtitle(String title);
+
+        void setToolbarButton(int type);
+
+        void showSubaddress(View view, final int subaddressIndex);
+    }
+
+    public interface ProgressListener {
+        void showProgressDialog(int msgId);
+
+        void showLedgerProgressDialog(int mode);
+
+        void dismissProgressDialog();
+    }
+
+    private ProgressListener progressCallback = null;
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof ProgressListener) {
+            progressCallback = (ProgressListener) context;
+        }
+        if (context instanceof Listener) {
+            activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onPause() {
+        Timber.d("onPause()");
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        Timber.d("onCreateView");
+
+        final Bundle b = getArguments();
+        managerMode = ((b != null) && (MODE_MANAGER.equals(b.getString(KEY_MODE))));
+
+        View view = inflater.inflate(R.layout.fragment_subaddress, container, false);
+
+        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
+        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setExitTransition(exitTransition);
+        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
+        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setReenterTransition(reenterTransition);
+
+        view.findViewById(R.id.fab).setOnClickListener(this);
+
+        if (managerMode) {
+            view.findViewById(R.id.tvInstruction).setVisibility(View.GONE);
+            view.findViewById(R.id.tvHint).setVisibility(View.GONE);
+        }
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new SubaddressInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onItemRangeInserted(int positionStart, int itemCount) {
+                list.scrollToPosition(positionStart);
+            }
+        });
+
+        Helper.hideKeyboard(getActivity());
+
+        wallet = WalletManager.getInstance().getWallet();
+
+        loadList();
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        postponeEnterTransition();
+        view.getViewTreeObserver().addOnPreDrawListener(() -> {
+            startPostponedEnterTransition();
+            return true;
+        });
+    }
+
+    public void loadList() {
+        Timber.d("loadList()");
+        final int numSubaddresses = wallet.getNumSubaddresses();
+        final List<Subaddress> list = new ArrayList<>();
+        for (int i = 0; i < numSubaddresses; i++) {
+            list.add(wallet.getSubaddressObject(i));
+        }
+        adapter.setInfos(list);
+    }
+
+    @Override
+    public void onBlockUpdate(Wallet wallet) {
+        loadList();
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.fab) {
+            getNewSubaddress();
+        }
+    }
+
+    private int lastUsedSubaddress() {
+        int lastUsedSubaddress = 0;
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex > lastUsedSubaddress)
+                lastUsedSubaddress = info.addressIndex;
+        }
+        return lastUsedSubaddress;
+    }
+
+    private void getNewSubaddress() {
+        final int maxSubaddresses = lastUsedSubaddress() + wallet.getDeviceType().getSubaddressLookahead();
+        if (wallet.getNumSubaddresses() < maxSubaddresses)
+            new AsyncSubaddress().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
+        else
+            Toast.makeText(getActivity(), getString(R.string.max_subaddress_warning), Toast.LENGTH_LONG).show();
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    @RequiredArgsConstructor
+    private class AsyncSubaddress extends AsyncTask<Void, Void, Boolean> {
+        boolean dialogOpened = false;
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if ((wallet.getDeviceType() == Wallet.Device.Device_Ledger) && (progressCallback != null)) {
+                progressCallback.showLedgerProgressDialog(LedgerProgressDialog.TYPE_SUBADDRESS);
+                dialogOpened = true;
+            }
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... params) {
+            if (params.length != 0) return false;
+            wallet.getNewSubaddress();
+            wallet.store();
+            return true;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            super.onPostExecute(result);
+            if (dialogOpened)
+                progressCallback.dismissProgressDialog();
+            if (!isAdded()) // never mind then
+                return;
+            loadList();
+        }
+    }
+
+    boolean managerMode = false;
+
+    // Callbacks from SubaddressInfoAdapter
+    @Override
+    public void onInteraction(final View view, final Subaddress subaddress) {
+        if (managerMode)
+            activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        else
+            activityCallback.onSubaddressSelected(subaddress); // also closes the fragment with onBackpressed()
+    }
+
+    @Override
+    public boolean onLongInteraction(View view, Subaddress subaddress) {
+        activityCallback.showSubaddress(view, subaddress.getAddressIndex());
+        return false;
+    }
+}

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

@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2017 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;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textfield.TextInputLayout;
+import com.google.android.material.transition.MaterialContainerTransform;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
+import com.m2049r.xmrwallet.model.TransactionInfo;
+import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
+import com.m2049r.xmrwallet.widget.Toolbar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SubaddressInfoFragment extends Fragment
+        implements TransactionInfoAdapter.OnInteractionListener, OnBlockUpdateListener {
+    private TransactionInfoAdapter adapter;
+
+    private Subaddress subaddress;
+
+    private TextInputLayout etName;
+    private TextView tvAddress;
+    private TextView tvTxLabel;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_subaddressinfo, container, false);
+
+        etName = view.findViewById(R.id.etName);
+        tvAddress = view.findViewById(R.id.tvAddress);
+        tvTxLabel = view.findViewById(R.id.tvTxLabel);
+
+        final RecyclerView list = view.findViewById(R.id.list);
+        adapter = new TransactionInfoAdapter(getActivity(), this);
+        list.setAdapter(adapter);
+
+        final Wallet wallet = activityCallback.getWallet();
+
+        Bundle b = getArguments();
+        final int subaddressIndex = b.getInt("subaddressIndex");
+        subaddress = wallet.getSubaddressObject(subaddressIndex);
+
+        etName.getEditText().setText(subaddress.getDisplayLabel());
+        tvAddress.setText(getContext().getString(R.string.subbaddress_info_subtitle,
+                subaddress.getAddressIndex(), subaddress.getSquashedAddress()));
+
+        etName.getEditText().setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus) {
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+            }
+        });
+        etName.getEditText().setOnEditorActionListener((v, actionId, event) -> {
+            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
+                    || (actionId == EditorInfo.IME_ACTION_DONE)) {
+                Helper.hideKeyboard(getActivity());
+                wallet.setSubaddressLabel(subaddressIndex, etName.getEditText().getText().toString());
+                onRefreshed(wallet);
+                return true;
+            }
+            return false;
+        });
+
+        onRefreshed(wallet);
+
+        return view;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        transform.setDrawingViewId(R.id.fragment_container);
+        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
+        setSharedElementEnterTransition(transform);
+    }
+
+    public void onRefreshed(final Wallet wallet) {
+        Timber.d("onRefreshed");
+        List<TransactionInfo> list = new ArrayList<>();
+        for (TransactionInfo info : wallet.getHistory().getAll()) {
+            if (info.addressIndex == subaddress.getAddressIndex())
+                list.add(info);
+        }
+        adapter.setInfos(list);
+        if (list.isEmpty())
+            tvTxLabel.setText(R.string.subaddress_notx_label);
+        else
+            tvTxLabel.setText(R.string.subaddress_tx_label);
+    }
+
+    @Override
+    public void onBlockUpdate(Wallet wallet) {
+        onRefreshed(wallet);
+    }
+
+    // Callbacks from TransactionInfoAdapter
+    @Override
+    public void onInteraction(final View view, final TransactionInfo infoItem) {
+        activityCallback.onTxDetailsRequest(view, infoItem);
+    }
+
+    Listener activityCallback;
+
+    // Container Activity must implement this interface
+    public interface Listener {
+        void onTxDetailsRequest(View view, TransactionInfo info);
+
+        Wallet getWallet();
+
+        void setToolbarButton(int type);
+
+        void setTitle(String title, String subtitle);
+
+        void setSubtitle(String subtitle);
+    }
+
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if (context instanceof Listener) {
+            this.activityCallback = (Listener) context;
+        } else {
+            throw new ClassCastException(context.toString()
+                    + " must implement Listener");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.subbaddress_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+}

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

@@ -22,7 +22,9 @@ import android.content.Intent;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.InputType;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -37,12 +39,14 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.transition.MaterialContainerTransform;
+import com.google.android.material.transition.MaterialElevationScale;
+import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
-import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.text.SimpleDateFormat;
@@ -52,6 +56,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.TimeZone;
 
+import timber.log.Timber;
+
 public class TxFragment extends Fragment {
 
     static public final String ARG_INFO = "info";
@@ -88,11 +94,16 @@ public class TxFragment extends Fragment {
     private ImageView tvXmrToLogo;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_tx_info, container, false);
 
+        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
+        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setExitTransition(exitTransition);
+        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
+        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setReenterTransition(reenterTransition);
+
         cvXmrTo = view.findViewById(R.id.cvXmrTo);
         tvTxXmrToKey = view.findViewById(R.id.tvTxXmrToKey);
         tvDestinationBtc = view.findViewById(R.id.tvDestinationBtc);
@@ -121,9 +132,8 @@ public class TxFragment extends Fragment {
             Toast.makeText(getActivity(), getString(R.string.message_copy_xmrtokey), Toast.LENGTH_SHORT).show();
         });
 
-        Bundle args = getArguments();
-        TransactionInfo info = args.getParcelable(ARG_INFO);
-        show(info);
+        info = getArguments().getParcelable(ARG_INFO);
+        show();
         return view;
     }
 
@@ -192,7 +202,7 @@ public class TxFragment extends Fragment {
     TransactionInfo info = null;
     UserNotes userNotes = null;
 
-    void loadNotes(TransactionInfo info) {
+    void loadNotes() {
         if ((userNotes == null) || (info.notes == null)) {
             info.notes = activityCallback.getTxNotes(info.hash);
         }
@@ -205,19 +215,28 @@ public class TxFragment extends Fragment {
         tvTxFee.setTextColor(clr);
     }
 
-    private void show(TransactionInfo info) {
+    private void showSubaddressLabel() {
+        final Subaddress subaddress = activityCallback.getWalletSubaddress(info.accountIndex, info.addressIndex);
+        final Context ctx = getContext();
+        Spanned label = Html.fromHtml(ctx.getString(R.string.tx_account_formatted,
+                info.accountIndex, info.addressIndex,
+                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoGreen) & 0xFFFFFF),
+                Integer.toHexString(ContextCompat.getColor(ctx, R.color.monerujoBackground) & 0xFFFFFF),
+                subaddress.getDisplayLabel()));
+        tvAccount.setText(label);
+        tvAccount.setOnClickListener(v -> activityCallback.showSubaddress(v, info.addressIndex));
+    }
+
+    private void show() {
         if (info.txKey == null) {
             info.txKey = activityCallback.getTxKey(info.hash);
         }
         if (info.address == null) {
-            info.address = activityCallback.getTxAddress(info.account, info.subaddress);
+            info.address = activityCallback.getTxAddress(info.accountIndex, info.addressIndex);
         }
-        loadNotes(info);
+        loadNotes();
 
-        activityCallback.setSubtitle(getString(R.string.tx_title));
-        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
-
-        tvAccount.setText(getString(R.string.tx_account_formatted, info.account, info.subaddress));
+        showSubaddressLabel();
         tvAddress.setText(info.address);
 
         tvTxTimestamp.setText(TS_FORMATTER.format(new Date(info.timestamp * 1000)));
@@ -256,8 +275,8 @@ public class TxFragment extends Fragment {
             setTxColour(ContextCompat.getColor(getContext(), R.color.tx_minus));
         }
         Set<String> destinations = new HashSet<>();
-        StringBuffer sb = new StringBuffer();
-        StringBuffer dstSb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
+        StringBuilder dstSb = new StringBuilder();
         if (info.transfers != null) {
             boolean newline = false;
             for (Transfer transfer : info.transfers) {
@@ -281,14 +300,12 @@ public class TxFragment extends Fragment {
             }
         } else {
             sb.append("-");
-            dstSb.append(info.direction ==
-                    TransactionInfo.Direction.Direction_In ?
-                    activityCallback.getWalletSubaddress(info.account, info.subaddress) :
+            dstSb.append(info.direction == TransactionInfo.Direction.Direction_In ?
+                    activityCallback.getWalletSubaddress(info.accountIndex, info.addressIndex).getAddress() :
                     "-");
         }
         tvTxTransfers.setText(sb.toString());
         tvDestination.setText(dstSb.toString());
-        this.info = info;
         showBtcInfo();
     }
 
@@ -334,7 +351,7 @@ public class TxFragment extends Fragment {
         final MaterialContainerTransform transform = new MaterialContainerTransform();
         transform.setDrawingViewId(R.id.fragment_container);
         transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), R.attr.colorSurface));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
         setSharedElementEnterTransition(transform);
     }
 
@@ -347,7 +364,7 @@ public class TxFragment extends Fragment {
     Listener activityCallback;
 
     public interface Listener {
-        String getWalletSubaddress(int accountIndex, int subaddressIndex);
+        Subaddress getWalletSubaddress(int accountIndex, int subaddressIndex);
 
         String getTxKey(String hash);
 
@@ -361,6 +378,8 @@ public class TxFragment extends Fragment {
 
         void setSubtitle(String subtitle);
 
+        void showSubaddress(View view, final int subaddressIndex);
+
     }
 
     @Override
@@ -385,4 +404,13 @@ public class TxFragment extends Fragment {
         Helper.hideKeyboard(getActivity());
         super.onPause();
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Timber.d("onResume()");
+        activityCallback.setSubtitle(getString(R.string.tx_title));
+        activityCallback.setToolbarButton(Toolbar.BUTTON_BACK);
+        showSubaddressLabel();
+    }
 }

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

@@ -79,6 +79,7 @@ public class WalletFragment extends Fragment
     private Button bSend;
     private ImageView ivStreetGunther;
     private Drawable streetGunther = null;
+    RecyclerView txlist;
 
     private Spinner sCurrency;
 
@@ -106,13 +107,6 @@ public class WalletFragment extends Fragment
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_wallet, container, false);
 
-        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
-        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setExitTransition(exitTransition);
-        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
-        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        setReenterTransition(reenterTransition);
-
         ivStreetGunther = view.findViewById(R.id.ivStreetGunther);
         tvStreetView = view.findViewById(R.id.tvStreetView);
         llBalance = view.findViewById(R.id.llBalance);
@@ -132,7 +126,8 @@ public class WalletFragment extends Fragment
         sCurrency = view.findViewById(R.id.sCurrency);
         List<String> currencies = new ArrayList<>();
         currencies.add(Helper.BASE_CRYPTO);
-        currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
+        if (Helper.SHOW_EXCHANGERATES)
+            currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
         ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(Objects.requireNonNull(getContext()), R.layout.item_spinner_balance, currencies);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         sCurrency.setAdapter(spinnerAdapter);
@@ -140,13 +135,19 @@ public class WalletFragment extends Fragment
         bSend = view.findViewById(R.id.bSend);
         bReceive = view.findViewById(R.id.bReceive);
 
-        RecyclerView recyclerView = view.findViewById(R.id.list);
-
+        txlist = view.findViewById(R.id.list);
         adapter = new TransactionInfoAdapter(getActivity(), this);
-        recyclerView.setAdapter(adapter);
+        txlist.setAdapter(adapter);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onItemRangeInserted(int positionStart, int itemCount) {
+                if ((positionStart == 0) && (txlist.computeVerticalScrollOffset() == 0))
+                    txlist.scrollToPosition(positionStart);
+            }
+        });
 
-        SwipeableRecyclerViewTouchListener swipeTouchListener =
-                new SwipeableRecyclerViewTouchListener(recyclerView,
+        txlist.addOnItemTouchListener(
+                new SwipeableRecyclerViewTouchListener(txlist,
                         new SwipeableRecyclerViewTouchListener.SwipeListener() {
                             @Override
                             public boolean canSwipeLeft(int position) {
@@ -173,10 +174,7 @@ public class WalletFragment extends Fragment
                                     adapter.removeItem(position);
                                 }
                             }
-                        });
-
-        recyclerView.addOnItemTouchListener(swipeTouchListener);
-
+                        }));
 
         bSend.setOnClickListener(v -> activityCallback.onSendRequest(v));
         bReceive.setOnClickListener(v -> activityCallback.onWalletReceive(v));
@@ -338,24 +336,34 @@ public class WalletFragment extends Fragment
         final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
         reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
         setReenterTransition(reenterTransition);
+
         activityCallback.onTxDetailsRequest(view, infoItem);
     }
 
     // called from activity
 
+
+    // if account index has changed scroll to top?
+    private int accountIndex = 0;
+
     public void onRefreshed(final Wallet wallet, final boolean full) {
         Timber.d("onRefreshed(%b)", full);
+
         if (full) {
             List<TransactionInfo> list = new ArrayList<>();
             final long streetHeight = activityCallback.getStreetModeHeight();
             Timber.d("StreetHeight=%d", streetHeight);
             for (TransactionInfo info : wallet.getHistory().getAll()) {
-                Timber.d("TxHeight=%d", info.blockheight);
+                Timber.d("TxHeight=%d, Label=%s", info.blockheight, info.subaddressLabel);
                 if ((info.isPending || (info.blockheight >= streetHeight))
                         && !dismissedTransactions.contains(info.hash))
                     list.add(info);
             }
             adapter.setInfos(list);
+            if (accountIndex != wallet.getAccountIndex()) {
+                accountIndex = wallet.getAccountIndex();
+                txlist.scrollToPosition(0);
+            }
         }
         updateStatus(wallet);
     }
@@ -522,9 +530,10 @@ public class WalletFragment extends Fragment
     @Override
     public void onResume() {
         super.onResume();
+        setExitTransition(null);
+        setReenterTransition(null);
         Timber.d("onResume()");
         activityCallback.setTitle(walletTitle, walletSubtitle);
-        //activityCallback.setToolbarButton(Toolbar.BUTTON_CLOSE); // TODO: Close button somewhere else
         activityCallback.setToolbarButton(Toolbar.BUTTON_NONE);
         setProgress(syncProgress);
         setProgress(syncText);

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

@@ -0,0 +1,63 @@
+/*
+ * 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.data;
+
+import java.util.regex.Pattern;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@RequiredArgsConstructor
+@ToString
+@EqualsAndHashCode
+public class Subaddress implements Comparable<Subaddress> {
+    @Getter
+    final private int accountIndex;
+    @Getter
+    final private int addressIndex;
+    @Getter
+    final private String address;
+    @Getter
+    private final String label;
+    @Getter
+    @Setter
+    private long amount;
+
+    @Override
+    public int compareTo(Subaddress another) { // newer is <
+        final int compareAccountIndex = another.accountIndex - accountIndex;
+        if (compareAccountIndex == 0)
+            return another.addressIndex - addressIndex;
+        return compareAccountIndex;
+    }
+
+    public String getSquashedAddress() {
+        return address.substring(0, 8) + "…" + address.substring(address.length() - 8);
+    }
+
+    public static final Pattern DEFAULT_LABEL_FORMATTER = Pattern.compile("^[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{2}:[0-9]{2}:[0-9]{2}$");
+
+    public String getDisplayLabel() {
+        if (label.isEmpty() || (DEFAULT_LABEL_FORMATTER.matcher(label).matches()))
+            return ("#" + addressIndex);
+        else
+            return label;
+    }
+}

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

@@ -117,32 +117,34 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
         View view = inflater.inflate(R.layout.fragment_send_address, container, false);
 
-        tvXmrTo = view.findViewById(R.id.tvXmrTo);
-
-        ibCrypto = new HashMap<>();
-        for (Crypto crypto : Crypto.values()) {
-            final ImageButton button = view.findViewById(crypto.getButtonId());
-            ibCrypto.put(crypto, button);
-            button.setOnClickListener(v -> {
-                if (possibleCryptos.contains(crypto)) {
-                    selectedCrypto = crypto;
-                    updateCryptoButtons(false);
-                } else {
-                    // show help what to do:
-                    if (button.getId() != R.id.ibXMR) {
-                        final String name = getResources().getStringArray(R.array.cryptos)[crypto.ordinal()];
-                        final String symbol = getCryptoForButton(button).getSymbol();
-                        tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help, name, symbol)));
-                        tvXmrTo.setVisibility(View.VISIBLE);
+        if (Helper.ALLOW_SHIFT) {
+            tvXmrTo = view.findViewById(R.id.tvXmrTo);
+            ibCrypto = new HashMap<>();
+            for (Crypto crypto : Crypto.values()) {
+                final ImageButton button = view.findViewById(crypto.getButtonId());
+                ibCrypto.put(crypto, button);
+                button.setOnClickListener(v -> {
+                    if (possibleCryptos.contains(crypto)) {
+                        selectedCrypto = crypto;
+                        updateCryptoButtons(false);
                     } else {
-                        tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help_xmr)));
-                        tvXmrTo.setVisibility(View.VISIBLE);
+                        // show help what to do:
+                        if (button.getId() != R.id.ibXMR) {
+                            final String name = getResources().getStringArray(R.array.cryptos)[crypto.ordinal()];
+                            final String symbol = getCryptoForButton(button).getSymbol();
+                            tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help, name, symbol)));
+                            tvXmrTo.setVisibility(View.VISIBLE);
+                        } else {
+                            tvXmrTo.setText(Html.fromHtml(getString(R.string.info_xmrto_help_xmr)));
+                            tvXmrTo.setVisibility(View.VISIBLE);
+                        }
                     }
-                }
-            });
+                });
+            }
+            updateCryptoButtons(true);
+        } else {
+            view.findViewById(R.id.llExchange).setVisibility(View.GONE);
         }
-        updateCryptoButtons(true);
-
         etAddress = view.findViewById(R.id.etAddress);
         etAddress.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         etAddress.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -181,6 +183,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                     selectedCrypto = Crypto.XMR;
                     sendListener.setMode(SendFragment.Mode.XMR);
                 }
+                if (!Helper.ALLOW_SHIFT) return;
                 if ((selectedCrypto == null) && isEthAddress(address)) {
                     Timber.d("isEthAddress");
                     possibleCryptos.add(Crypto.ETH);
@@ -285,6 +288,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
     }
 
     private void updateCryptoButtons(boolean noAddress) {
+        if (!Helper.ALLOW_SHIFT) return;
         for (Crypto crypto : Crypto.values()) {
             if (crypto == selectedCrypto) {
                 selectedCrypto(crypto);
@@ -447,7 +451,11 @@ public class SendAddressWizardFragment extends SendWizardFragment {
         BarcodeData barcodeData = sendListener.getBarcodeData();
         if (barcodeData != null) {
             Timber.d("GOT DATA");
-
+            if (!Helper.ALLOW_SHIFT && (barcodeData.asset != Crypto.XMR)) {
+                Timber.d("BUT ONLY XMR SUPPORTED");
+                barcodeData = null;
+                sendListener.setBarcodeData(barcodeData);
+            }
             if (barcodeData.address != null) {
                 etAddress.getEditText().setText(barcodeData.address);
                 possibleCryptos.clear();
@@ -458,7 +466,8 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                     possibleCryptos.add(barcodeData.asset);
                     selectedCrypto = barcodeData.asset;
                 }
-                updateCryptoButtons(false);
+                if (Helper.ALLOW_SHIFT)
+                    updateCryptoButtons(false);
                 if (checkAddress()) {
                     if (barcodeData.security == BarcodeData.Security.OA_NO_DNSSEC)
                         etAddress.setError(getString(R.string.send_address_no_dnssec));

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

@@ -66,7 +66,7 @@ public class SendFragment extends Fragment
         SendSuccessWizardFragment.Listener,
         OnBackPressedListener, OnUriScannedListener {
 
-    final static public int MIXIN = 10;
+    final static public int MIXIN = 0;
 
     private Listener activityCallback;
 
@@ -547,7 +547,7 @@ public class SendFragment extends Fragment
         final MaterialContainerTransform transform = new MaterialContainerTransform();
         transform.setDrawingViewId(R.id.fragment_container);
         transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
-        transform.setAllContainerColors(ThemeHelper.getThemedColor(Objects.requireNonNull(getContext()), R.attr.colorSurface));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(getContext(), android.R.attr.colorBackground));
         setSharedElementEnterTransition(transform);
     }
 

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

@@ -48,7 +48,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
     public interface OnInteractionListener {
         void onInteraction(View view, NodeInfo item);
 
-        void onLongInteraction(View view, NodeInfo item);
+        boolean onLongInteraction(View view, NodeInfo item);
     }
 
     private final List<NodeInfo> nodeItems = new ArrayList<>();
@@ -213,10 +213,10 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
             if (listener != null) {
                 int position = getAdapterPosition(); // gets item position
                 if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
-                    listener.onLongInteraction(view, nodeItems.get(position));
+                    return listener.onLongInteraction(view, nodeItems.get(position));
                 }
             }
-            return true;
+            return false;
         }
     }
 

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

@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2017 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.layout;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.util.Helper;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import timber.log.Timber;
+
+public class SubaddressInfoAdapter extends RecyclerView.Adapter<SubaddressInfoAdapter.ViewHolder> {
+    public interface OnInteractionListener {
+        void onInteraction(View view, Subaddress item);
+
+        boolean onLongInteraction(View view, Subaddress item);
+    }
+
+    private final List<Subaddress> items;
+    private final OnInteractionListener listener;
+
+    Context context;
+
+    public SubaddressInfoAdapter(Context context, OnInteractionListener listener) {
+        this.context = context;
+        this.items = new ArrayList<>();
+        this.listener = listener;
+    }
+
+    private static class SubaddressInfoDiff extends DiffCallback<Subaddress> {
+
+        public SubaddressInfoDiff(List<Subaddress> oldList, List<Subaddress> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).getAddress().equals(mNewList.get(newItemPosition).getAddress());
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
+        }
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.item_subaddress, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(final ViewHolder holder, int position) {
+        holder.bind(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+    public Subaddress getItem(int position) {
+        return items.get(position);
+    }
+
+    public void setInfos(List<Subaddress> newItems) {
+        if (newItems == null) {
+            newItems = new ArrayList<>();
+            Timber.d("setInfos null");
+        } else {
+            Timber.d("setInfos %s", newItems.size());
+        }
+        Collections.sort(newItems);
+        final DiffCallback<Subaddress> diffCallback = new SubaddressInfoDiff(items, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        items.clear();
+        items.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
+        final TextView tvName;
+        final TextView tvAddress;
+        final TextView tvAmount;
+        Subaddress item;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            tvName = itemView.findViewById(R.id.tvName);
+            tvAddress = itemView.findViewById(R.id.tvAddress);
+            tvAmount = itemView.findViewById(R.id.tx_amount);
+            itemView.setOnClickListener(this);
+            itemView.setOnLongClickListener(this);
+        }
+
+        void bind(int position) {
+            item = getItem(position);
+            itemView.setTransitionName(context.getString(R.string.subaddress_item_transition_name, item.getAddressIndex()));
+
+            final String label = item.getDisplayLabel();
+            final String address = context.getString(R.string.subbaddress_info_subtitle,
+                    item.getAddressIndex(), item.getSquashedAddress());
+            tvName.setText(label.isEmpty() ? address : label);
+            tvAddress.setText(address);
+            final long amount = item.getAmount();
+            if (amount > 0)
+                tvAmount.setText(context.getString(R.string.tx_list_amount_positive,
+                        Helper.getDisplayAmount(amount, Helper.DISPLAY_DIGITS_INFO)));
+            else
+                tvAmount.setText("");
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (listener != null) {
+                int position = getAdapterPosition(); // gets item position
+                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
+                    listener.onInteraction(view, getItem(position));
+                }
+            }
+        }
+
+        @Override
+        public boolean onLongClick(View view) {
+            if (listener != null) {
+                int position = getAdapterPosition(); // gets item position
+                if (position != RecyclerView.NO_POSITION) { // Check if an item was deleted, but the user clicked it before the UI removed it
+                    return listener.onLongInteraction(view, getItem(position));
+                }
+            }
+            return true;
+        }
+    }
+}

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

@@ -17,6 +17,8 @@
 package com.m2049r.xmrwallet.layout;
 
 import android.content.Context;
+import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,7 +48,6 @@ import java.util.TimeZone;
 import timber.log.Timber;
 
 public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfoAdapter.ViewHolder> {
-
     private final SimpleDateFormat DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
     private final int outboundColour;
@@ -94,6 +95,7 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
             return (oldItem.direction == newItem.direction)
                     && (oldItem.isPending == newItem.isPending)
                     && (oldItem.isFailed == newItem.isFailed)
+                    && (oldItem.subaddressLabel.equals(newItem.subaddressLabel))
                     && (Objects.equals(oldItem.notes, newItem.notes));
         }
     }
@@ -211,14 +213,25 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
                 setTxColour(outboundColour);
             }
 
+            String tag = null;
+            String info = "";
+            if ((infoItem.addressIndex != 0) && (infoItem.direction == TransactionInfo.Direction.Direction_In))
+                tag = infoItem.getDisplayLabel();
             if ((userNotes.note.isEmpty())) {
-                this.tvPaymentId.setText(infoItem.paymentId.equals("0000000000000000") ?
-                        (infoItem.subaddress != 0 ?
-                                (context.getString(R.string.tx_subaddress, infoItem.subaddress)) :
-                                "") :
-                        infoItem.paymentId);
+                if (!infoItem.paymentId.equals("0000000000000000")) {
+                    info = infoItem.paymentId;
+                }
             } else {
-                this.tvPaymentId.setText(userNotes.note);
+                info = userNotes.note;
+            }
+            if (tag == null) {
+                tvPaymentId.setText(info);
+            } else {
+                Spanned label = Html.fromHtml(context.getString(R.string.tx_details_notes,
+                        Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoGreen) & 0xFFFFFF),
+                        Integer.toHexString(ContextCompat.getColor(context, R.color.monerujoBackground) & 0xFFFFFF),
+                        tag, info.isEmpty() ? "" : ("&nbsp; " + info)));
+                tvPaymentId.setText(label);
             }
 
             this.tvDateTime.setText(getDateTime(infoItem.timestamp));

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

@@ -74,7 +74,7 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
 
         @Override
         public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
-            return mOldList.get(oldItemPosition).name.equals(mNewList.get(newItemPosition).name);
+            return mOldList.get(oldItemPosition).getName().equals(mNewList.get(newItemPosition).getName());
         }
 
         @Override
@@ -86,9 +86,9 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.item_wallet, parent, false);
-        return new ViewHolder(view);
+        return new ViewHolder(
+                LayoutInflater.from(parent.getContext()).inflate(R.layout.item_wallet, parent, false)
+        );
     }
 
     @Override
@@ -122,7 +122,6 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
 
     class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         final TextView tvName;
-        final TextView tvAddress;
         final ImageButton ibOptions;
         WalletManager.WalletInfo infoItem;
         boolean popupOpen = false;
@@ -130,7 +129,6 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
         ViewHolder(View itemView) {
             super(itemView);
             tvName = itemView.findViewById(R.id.tvName);
-            tvAddress = itemView.findViewById(R.id.tvAddress);
             ibOptions = itemView.findViewById(R.id.ibOptions);
             ibOptions.setOnClickListener(view -> {
                 if (popupOpen) return;
@@ -160,8 +158,7 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
 
         void bind(int position) {
             infoItem = infoItems.get(position);
-            tvName.setText(infoItem.name);
-            tvAddress.setText(infoItem.address.substring(0, 16) + "...");
+            tvName.setText(infoItem.getName());
         }
 
         @Override

app/src/main/java/com/m2049r/xmrwallet/model/TransactionHistory.java

@@ -71,18 +71,18 @@ public class TransactionHistory {
 //    }
 
     public void refresh() {
-        List<TransactionInfo> t = refreshJ();
-        Timber.d("refreshed %d", t.size());
-        for (Iterator<TransactionInfo> iterator = t.iterator(); iterator.hasNext(); ) {
+        List<TransactionInfo> transactionInfos = refreshJ();
+        Timber.d("refreshed %d", transactionInfos.size());
+        for (Iterator<TransactionInfo> iterator = transactionInfos.iterator(); iterator.hasNext(); ) {
             TransactionInfo info = iterator.next();
-            if (info.account != accountIndex) {
+            if (info.accountIndex != accountIndex) {
                 iterator.remove();
                 Timber.d("removed %s", info.hash);
             } else {
                 Timber.d("kept %s", info.hash);
             }
         }
-        transactions = t;
+        transactions = transactionInfos;
     }
 
     private native List<TransactionInfo> refreshJ();

app/src/main/java/com/m2049r/xmrwallet/model/TransactionInfo.java

@@ -19,13 +19,17 @@ package com.m2049r.xmrwallet.model;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.m2049r.xmrwallet.data.Subaddress;
+
 import java.util.List;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
 // this is not the TransactionInfo from the API as that is owned by the TransactionHistory
 // this is a POJO for the TransactionInfoAdapter
 public class TransactionInfo implements Parcelable, Comparable<TransactionInfo> {
-    static final String TAG = "TransactionInfo";
-
+    @RequiredArgsConstructor
     public enum Direction {
         Direction_In(0),
         Direction_Out(1);
@@ -40,15 +44,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
             return null;
         }
 
-        public int getValue() {
-            return value;
-        }
-
-        private int value;
-
-        Direction(int value) {
-            this.value = value;
-        }
+        @Getter
+        private final int value;
     }
 
     public Direction direction;
@@ -60,8 +57,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
     public String hash;
     public long timestamp;
     public String paymentId;
-    public int account;
-    public int subaddress;
+    public int accountIndex;
+    public int addressIndex;
     public long confirmations;
     public String subaddressLabel;
     public List<Transfer> transfers;
@@ -80,8 +77,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
             String hash,
             long timestamp,
             String paymentId,
-            int account,
-            int subaddress,
+            int accountIndex,
+            int addressIndex,
             long confirmations,
             String subaddressLabel,
             List<Transfer> transfers) {
@@ -94,13 +91,20 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         this.hash = hash;
         this.timestamp = timestamp;
         this.paymentId = paymentId;
-        this.account = account;
-        this.subaddress = subaddress;
+        this.accountIndex = accountIndex;
+        this.addressIndex = addressIndex;
         this.confirmations = confirmations;
         this.subaddressLabel = subaddressLabel;
         this.transfers = transfers;
     }
 
+    public String getDisplayLabel() {
+        if (subaddressLabel.isEmpty() || (Subaddress.DEFAULT_LABEL_FORMATTER.matcher(subaddressLabel).matches()))
+            return ("#" + addressIndex);
+        else
+            return subaddressLabel;
+    }
+
     public String toString() {
         return direction + "@" + blockheight + " " + amount;
     }
@@ -116,8 +120,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         out.writeString(hash);
         out.writeLong(timestamp);
         out.writeString(paymentId);
-        out.writeInt(account);
-        out.writeInt(subaddress);
+        out.writeInt(accountIndex);
+        out.writeInt(addressIndex);
         out.writeLong(confirmations);
         out.writeString(subaddressLabel);
         out.writeList(transfers);
@@ -146,8 +150,8 @@ public class TransactionInfo implements Parcelable, Comparable<TransactionInfo>
         hash = in.readString();
         timestamp = in.readLong();
         paymentId = in.readString();
-        account = in.readInt();
-        subaddress = in.readInt();
+        accountIndex = in.readInt();
+        addressIndex = in.readInt();
         confirmations = in.readLong();
         subaddressLabel = in.readString();
         transfers = in.readArrayList(Transfer.class.getClassLoader());

app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java

@@ -19,6 +19,7 @@ package com.m2049r.xmrwallet.model;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.TxData;
 
 import java.io.File;
@@ -26,6 +27,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import timber.log.Timber;
 
 public class Wallet {
@@ -104,10 +107,14 @@ public class Wallet {
         this.accountIndex = accountIndex;
     }
 
+    @RequiredArgsConstructor
+    @Getter
     public enum Device {
-        Device_Undefined,
-        Device_Software,
-        Device_Ledger
+        Device_Undefined(0, 0),
+        Device_Software(50, 200),
+        Device_Ledger(5, 20);
+        private final int accountLookahead;
+        private final int subaddressLookahead;
     }
 
     public enum StatusEnum {
@@ -160,6 +167,24 @@ public class Wallet {
 
     private native String getAddressJ(int accountIndex, int addressIndex);
 
+    public Subaddress getSubaddressObject(int accountIndex, int subAddressIndex) {
+        return new Subaddress(accountIndex, subAddressIndex,
+                getSubaddress(subAddressIndex), getSubaddressLabel(subAddressIndex));
+    }
+
+    public Subaddress getSubaddressObject(int subAddressIndex) {
+        Subaddress subaddress = getSubaddressObject(accountIndex, subAddressIndex);
+        long amount = 0;
+        for (TransactionInfo info : getHistory().getAll()) {
+            if ((info.addressIndex == subAddressIndex)
+                    && (info.direction == TransactionInfo.Direction.Direction_In)) {
+                amount += info.amount;
+            }
+        }
+        subaddress.setAmount(amount);
+        return subaddress;
+    }
+
     public native String getPath();
 
     public NetworkType getNetworkType() {
@@ -428,6 +453,11 @@ public class Wallet {
         setSubaddressLabel(accountIndex, 0, label);
     }
 
+    public void setSubaddressLabel(int addressIndex, String label) {
+        setSubaddressLabel(accountIndex, addressIndex, label);
+        getHistory().refreshWithNotes(this);
+    }
+
     public native void setSubaddressLabel(int accountIndex, int addressIndex, String label);
 
     public native int getNumAccounts();

app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java

@@ -21,15 +21,13 @@ import com.m2049r.xmrwallet.data.Node;
 import com.m2049r.xmrwallet.ledger.Ledger;
 import com.m2049r.xmrwallet.util.RestoreHeight;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import lombok.Getter;
 import timber.log.Timber;
 
 public class WalletManager {
@@ -103,7 +101,8 @@ public class WalletManager {
             wallet.setRestoreHeight(restoreHeight);
             Timber.d("Changed Restore Height from %d to %d", oldHeight, wallet.getRestoreHeight());
             wallet.setPassword(password); // this rewrites the keys file (which contains the restore height)
-        }
+        } else
+            Timber.e(wallet.getStatus().toString());
         return wallet;
     }
 
@@ -210,46 +209,22 @@ public class WalletManager {
     //public native List<String> findWallets(String path); // this does not work - some error in boost
 
     public class WalletInfo implements Comparable<WalletInfo> {
-        public File path;
-        public String name;
-        public String address;
+        @Getter
+        final private File path;
+        @Getter
+        final private String name;
+
+        public WalletInfo(File wallet) {
+            path = wallet.getParentFile();
+            name = wallet.getName();
+        }
 
         @Override
         public int compareTo(WalletInfo another) {
-            int n = name.toLowerCase().compareTo(another.name.toLowerCase());
-            if (n != 0) {
-                return n;
-            } else { // wallet names are the same
-                return address.compareTo(another.address);
-            }
+            return name.toLowerCase().compareTo(another.name.toLowerCase());
         }
     }
 
-    public WalletInfo getWalletInfo(File wallet) {
-        WalletInfo info = new WalletInfo();
-        info.path = wallet.getParentFile();
-        info.name = wallet.getName();
-        File addressFile = new File(info.path, info.name + ".address.txt");
-        //Timber.d(addressFile.getAbsolutePath());
-        info.address = "??????";
-        BufferedReader addressReader = null;
-        try {
-            addressReader = new BufferedReader(new FileReader(addressFile));
-            info.address = addressReader.readLine();
-        } catch (IOException ex) {
-            Timber.d(ex.getLocalizedMessage());
-        } finally {
-            if (addressReader != null) {
-                try {
-                    addressReader.close();
-                } catch (IOException ex) {
-                    // that's just too bad
-                }
-            }
-        }
-        return info;
-    }
-
     public List<WalletInfo> findWallets(File path) {
         List<WalletInfo> wallets = new ArrayList<>();
         Timber.d("Scanning: %s", path.getAbsolutePath());
@@ -261,7 +236,7 @@ public class WalletManager {
         for (int i = 0; i < found.length; i++) {
             String filename = found[i].getName();
             File f = new File(found[i].getParent(), filename.substring(0, filename.length() - 5)); // 5 is length of ".keys"+1
-            wallets.add(getWalletInfo(f));
+            wallets.add(new WalletInfo(f));
         }
         return wallets;
     }

app/src/main/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeApiImpl.java

@@ -167,7 +167,7 @@ public class ExchangeApiImpl implements ExchangeApi {
     private Calendar fetchDate = null;
 
     synchronized private ExchangeRate getRate(String currency) throws ExchangeException {
-        Timber.e("Getting %s", currency);
+        Timber.d("Getting %s", currency);
         final Double rate = fxEntries.get(currency);
         if (rate == null) throw new ExchangeException(404, "Currency not supported: " + currency);
         return new ExchangeRateImpl(currency, rate, fxDate.getTime());

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -34,7 +34,6 @@ import android.hardware.fingerprint.FingerprintManager;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.CancellationSignal;
-import android.os.Environment;
 import android.os.StrictMode;
 import android.system.ErrnoException;
 import android.system.Os;
@@ -58,6 +57,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputLayout;
 import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.model.WalletManager;
 
 import java.io.File;
@@ -77,16 +77,16 @@ import javax.net.ssl.HttpsURLConnection;
 import timber.log.Timber;
 
 public class Helper {
-    static private final String FLAVOR_SUFFIX =
-            (BuildConfig.FLAVOR.startsWith("prod") ? "" : "." + BuildConfig.FLAVOR)
-                    + (BuildConfig.DEBUG ? "-debug" : "");
-
     static public final String NOCRAZYPASS_FLAGFILE = ".nocrazypass";
 
-    static public final String BASE_CRYPTO = "XMR";
+    static public final String BASE_CRYPTO = Crypto.XMR.getSymbol();
+    static public final int XMR_DECIMALS = 12;
 
-    static private final String WALLET_DIR = "monerujo" + FLAVOR_SUFFIX;
-    static private final String HOME_DIR = "monero" + FLAVOR_SUFFIX;
+    static public final boolean SHOW_EXCHANGERATES = true;
+    static public final boolean ALLOW_SHIFT = true;
+
+    static private final String WALLET_DIR = "wallets";
+    static private final String MONERO_DIR = "monero";
 
     static public int DISPLAY_DIGITS_INFO = 5;
 
@@ -95,12 +95,7 @@ public class Helper {
     }
 
     static public File getStorage(Context context, String folderName) {
-        if (!isExternalStorageWritable()) {
-            String msg = context.getString(R.string.message_strorage_not_writable);
-            Timber.e(msg);
-            throw new IllegalStateException(msg);
-        }
-        File dir = new File(Environment.getExternalStorageDirectory(), folderName);
+        File dir = new File(context.getFilesDir(), folderName);
         if (!dir.exists()) {
             Timber.i("Creating %s", dir.getAbsolutePath());
             dir.mkdirs(); // try to make it
@@ -113,24 +108,6 @@ public class Helper {
         return dir;
     }
 
-    static public final int PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE = 1;
-
-    static public boolean getWritePermission(Activity context) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            if (context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    == PackageManager.PERMISSION_DENIED) {
-                Timber.w("Permission denied to WRITE_EXTERNAL_STORAGE - requesting it");
-                String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
-                context.requestPermissions(permissions, PERMISSIONS_REQUEST_WRITE_EXTERNAL_STORAGE);
-                return false;
-            } else {
-                return true;
-            }
-        } else {
-            return true;
-        }
-    }
-
     static public final int PERMISSIONS_REQUEST_CAMERA = 7;
 
     static public boolean getCameraPermission(Activity context) {
@@ -156,12 +133,6 @@ public class Helper {
         return f;
     }
 
-    /* Checks if external storage is available for read and write */
-    private static boolean isExternalStorageWritable() {
-        String state = Environment.getExternalStorageState();
-        return Environment.MEDIA_MOUNTED.equals(state);
-    }
-
     static public void showKeyboard(Activity act) {
         InputMethodManager imm = (InputMethodManager) act.getSystemService(Context.INPUT_METHOD_SERVICE);
         final View focus = act.getCurrentFocus();
@@ -189,11 +160,11 @@ public class Helper {
     }
 
     static public BigDecimal getDecimalAmount(long amount) {
-        return new BigDecimal(amount).scaleByPowerOfTen(-12);
+        return new BigDecimal(amount).scaleByPowerOfTen(-XMR_DECIMALS);
     }
 
     static public String getDisplayAmount(long amount) {
-        return getDisplayAmount(amount, 12);
+        return getDisplayAmount(amount, XMR_DECIMALS);
     }
 
     static public String getDisplayAmount(long amount, int maxDecimals) {
@@ -225,7 +196,7 @@ public class Helper {
     static public String getDisplayAmount(double amount) {
         // a Java bug does not strip zeros properly if the value is 0
         BigDecimal d = new BigDecimal(amount)
-                .setScale(12, BigDecimal.ROUND_HALF_UP)
+                .setScale(XMR_DECIMALS, BigDecimal.ROUND_HALF_UP)
                 .stripTrailingZeros();
         if (d.scale() < 1)
             d = d.setScale(1, BigDecimal.ROUND_UNNECESSARY);
@@ -339,7 +310,7 @@ public class Helper {
 
     static public void setMoneroHome(Context context) {
         try {
-            String home = getStorage(context, HOME_DIR).getAbsolutePath();
+            String home = getStorage(context, MONERO_DIR).getAbsolutePath();
             Os.setenv("HOME", home, true);
         } catch (ErrnoException ex) {
             throw new IllegalStateException(ex);
@@ -355,7 +326,7 @@ public class Helper {
 
     // TODO make the log levels refer to the  WalletManagerFactory::LogLevel enum ?
     static public void initLogger(Context context, int level) {
-        String home = getStorage(context, HOME_DIR).getAbsolutePath();
+        String home = getStorage(context, MONERO_DIR).getAbsolutePath();
         WalletManager.initLogger(home + "/monerujo", "monerujo.log");
         if (level >= WalletManager.LOGLEVEL_SILENT)
             WalletManager.setLogLevel(level);

app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java

@@ -24,9 +24,10 @@ import android.os.Build;
 import android.security.KeyPairGeneratorSpec;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
-import androidx.annotation.NonNull;
 import android.util.Base64;
 
+import androidx.annotation.NonNull;
+
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -167,6 +168,11 @@ public class KeyStoreHelper {
                 .remove(wallet).apply();
     }
 
+    public static void copyWalletUserPass(Context context, String srcWallet, String dstWallet) throws BrokenPasswordStoreException {
+        final String pass = loadWalletUserPass(context, srcWallet);
+        saveWalletUserPass(context, dstWallet, pass);
+    }
+
     /**
      * Creates a public and private key and stores it using the Android Key
      * Store, so that only this application will be able to access the keys.

app/src/main/java/com/m2049r/xmrwallet/util/LegacyStorageHelper.java

@@ -0,0 +1,171 @@
+package com.m2049r.xmrwallet.util;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Environment;
+import android.preference.PreferenceManager;
+
+import com.m2049r.xmrwallet.BuildConfig;
+import com.m2049r.xmrwallet.model.WalletManager;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import lombok.RequiredArgsConstructor;
+import timber.log.Timber;
+
+@RequiredArgsConstructor
+public class LegacyStorageHelper {
+    final private File srcDir;
+    final private File dstDir;
+
+    static public void migrateWallets(Context context) {
+        try {
+            if (isStorageMigrated(context)) return;
+            if (!hasReadPermission(context)) {
+                // nothing to migrate, so don't try again
+                setStorageMigrated(context);
+                return;
+            }
+            final File oldRoot = getWalletRoot();
+            if (!oldRoot.exists()) {
+                // nothing to migrate, so don't try again
+                setStorageMigrated(context);
+                return;
+            }
+            final File newRoot = Helper.getWalletRoot(context);
+            (new LegacyStorageHelper(oldRoot, newRoot)).migrate();
+            setStorageMigrated(context); // done it once - don't try again
+        } catch (IllegalStateException ex) {
+            Timber.d(ex);
+            // nothing we can do here
+        }
+    }
+
+    public void migrate() {
+        String addressPrefix = WalletManager.getInstance().addressPrefix();
+        File[] wallets = srcDir.listFiles((dir, filename) -> filename.endsWith(".keys"));
+        if (wallets == null) return;
+        for (File wallet : wallets) {
+            final String walletName = wallet.getName().substring(0, wallet.getName().length() - ".keys".length());
+            if (addressPrefix.indexOf(getAddress(walletName).charAt(0)) < 0) {
+                Timber.d("skipping %s", walletName);
+                continue;
+            }
+            try {
+                copy(walletName);
+            } catch (IOException ex) { // something failed - try to clean up
+                deleteDst(walletName);
+            }
+        }
+    }
+
+    // return "@" by default so we don't need to deal with null stuff
+    private String getAddress(String walletName) {
+        File addressFile = new File(srcDir, walletName + ".address.txt");
+        if (!addressFile.exists()) return "@";
+        try (BufferedReader addressReader = new BufferedReader(new FileReader(addressFile))) {
+            return addressReader.readLine();
+        } catch (IOException ex) {
+            Timber.d(ex.getLocalizedMessage());
+        }
+        return "@";
+    }
+
+    private void copy(String walletName) throws IOException {
+        final String dstName = getUniqueName(dstDir, walletName);
+        copyFile(new File(srcDir, walletName), new File(dstDir, dstName));
+        copyFile(new File(srcDir, walletName + ".keys"), new File(dstDir, dstName + ".keys"));
+    }
+
+    private void deleteDst(String walletName) {
+        // do our best, but if it fails, it fails
+        (new File(dstDir, walletName)).delete();
+        (new File(dstDir, walletName + ".keys")).delete();
+    }
+
+    private void copyFile(File src, File dst) throws IOException {
+        if (!src.exists()) return;
+        Timber.d("%s => %s", src.getAbsolutePath(), dst.getAbsolutePath());
+        try (FileChannel inChannel = new FileInputStream(src).getChannel();
+             FileChannel outChannel = new FileOutputStream(dst).getChannel()) {
+            inChannel.transferTo(0, inChannel.size(), outChannel);
+        }
+    }
+
+    private static boolean isExternalStorageWritable() {
+        String state = Environment.getExternalStorageState();
+        return Environment.MEDIA_MOUNTED.equals(state);
+    }
+
+    private static File getWalletRoot() {
+        if (!isExternalStorageWritable())
+            throw new IllegalStateException();
+
+        // wallet folder for legacy (pre-Q) installations
+        final String FLAVOR_SUFFIX =
+                (BuildConfig.FLAVOR.startsWith("prod") ? "" : "." + BuildConfig.FLAVOR)
+                        + (BuildConfig.DEBUG ? "-debug" : "");
+        final String WALLET_DIR = "monerujo" + FLAVOR_SUFFIX;
+
+        File dir = new File(Environment.getExternalStorageDirectory(), WALLET_DIR);
+        if (!dir.exists() || !dir.isDirectory())
+            throw new IllegalStateException();
+        return dir;
+    }
+
+    private static boolean hasReadPermission(Context context) {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            return context.checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_DENIED;
+        } else {
+            return true;
+        }
+    }
+
+    private static final Pattern WALLET_PATTERN = Pattern.compile("^(.+) \\(([0-9]+)\\).keys$");
+
+    private static String getUniqueName(File root, String name) {
+        if (!(new File(root, name + ".keys")).exists()) // <name> does not exist => it's ok to use
+            return name;
+
+        File[] wallets = root.listFiles(
+                (dir, filename) -> {
+                    Matcher m = WALLET_PATTERN.matcher(filename);
+                    if (m.find())
+                        return m.group(1).equals(name);
+                    else return false;
+                });
+        if (wallets.length == 0) return name + " (1)";
+        int maxIndex = 0;
+        for (File wallet : wallets) {
+            try {
+                final Matcher m = WALLET_PATTERN.matcher(wallet.getName());
+                if (!m.find())
+                    throw new IllegalStateException("this must match as it did before");
+                final int index = Integer.parseInt(m.group(2));
+                if (index > maxIndex) maxIndex = index;
+            } catch (NumberFormatException ex) {
+                // this cannot happen & we can ignore it if it does
+            }
+        }
+        return name + " (" + (maxIndex + 1) + ")";
+    }
+
+    private static final String MIGRATED_KEY = "migrated_legacy_storage";
+
+    public static boolean isStorageMigrated(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(MIGRATED_KEY, false);
+    }
+
+    public static void setStorageMigrated(Context context) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(MIGRATED_KEY, true).apply();
+    }
+}

app/src/main/java/com/m2049r/xmrwallet/util/Notice.java

@@ -18,8 +18,6 @@ package com.m2049r.xmrwallet.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,8 +25,12 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
+import com.m2049r.xmrwallet.ledger.Ledger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,18 +46,20 @@ public class Notice {
         synchronized (Notice.class) {
             if (notices != null) return;
             notices = new ArrayList<>();
-            notices.add(
-                    new Notice(NOTICE_SHOW_XMRTO_ENABLED_SEND,
-                            R.string.info_xmrto_enabled,
-                            R.string.help_xmrto,
-                            1)
-            );
-            notices.add(
-                    new Notice(NOTICE_SHOW_LEDGER,
-                            R.string.info_ledger_enabled,
-                            R.string.help_create_ledger,
-                            1)
-            );
+            if (Helper.ALLOW_SHIFT)
+                notices.add(
+                        new Notice(NOTICE_SHOW_XMRTO_ENABLED_SEND,
+                                R.string.info_xmrto_enabled,
+                                R.string.help_xmrto,
+                                1)
+                );
+            if (Ledger.ENABLED)
+                notices.add(
+                        new Notice(NOTICE_SHOW_LEDGER,
+                                R.string.info_ledger_enabled,
+                                R.string.help_create_ledger,
+                                1)
+                );
         }
     }
 

app/src/main/java/com/m2049r/xmrwallet/util/RestoreHeight.java

@@ -26,6 +26,8 @@ import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
 public class RestoreHeight {
+    static final int DIFFICULTY_TARGET = 120; // seconds
+
     static private RestoreHeight Singleton = null;
 
     static public RestoreHeight getInstance() {
@@ -190,7 +192,7 @@ public class RestoreHeight {
         } else {
             long days = TimeUnit.DAYS.convert(query.getTimeInMillis() - prevTime,
                     TimeUnit.MILLISECONDS);
-            height = Math.round(prevBc + 1.0 * days * (24 * 60 / 2));
+            height = Math.round(prevBc + 1.0 * days * (24f * 60 * 60 / DIFFICULTY_TARGET));
         }
         return height;
     }

app/src/main/java/com/m2049r/xmrwallet/util/ZipBackup.java

@@ -0,0 +1,64 @@
+package com.m2049r.xmrwallet.util;
+
+import android.content.Context;
+import android.net.Uri;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class ZipBackup {
+    final private Context context;
+    final private String walletName;
+
+    private ZipOutputStream zip;
+
+    public void writeTo(Uri zipUri) throws IOException {
+        if (zip != null)
+            throw new IllegalStateException("zip already initialized");
+        try {
+            zip = new ZipOutputStream(context.getContentResolver().openOutputStream(zipUri));
+
+            final File walletRoot = Helper.getWalletRoot(context);
+            addFile(new File(walletRoot, walletName + ".keys"));
+            addFile(new File(walletRoot, walletName));
+
+            zip.close();
+        } finally {
+            if (zip != null) zip.close();
+        }
+    }
+
+    private void addFile(File file) throws IOException {
+        if (!file.exists()) return; // ignore missing files (e.g. the cache file might not exist)
+        ZipEntry entry = new ZipEntry(file.getName());
+        zip.putNextEntry(entry);
+        writeFile(file);
+        zip.closeEntry();
+    }
+
+    private void writeFile(File source) throws IOException {
+        try (InputStream is = new FileInputStream(source)) {
+            byte[] buffer = new byte[8192];
+            int length;
+            while ((length = is.read(buffer)) > 0) {
+                zip.write(buffer, 0, length);
+            }
+        }
+    }
+
+    private static final SimpleDateFormat DATETIME_FORMATTER =
+            new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss");
+
+    public String getBackupName() {
+        return walletName + " " + DATETIME_FORMATTER.format(new Date());
+    }
+}