diff --git a/app/build.gradle b/app/build.gradle
index 8c711b7..14ee26e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
applicationId "com.m2049r.xmrwallet"
minSdkVersion 21
targetSdkVersion 25
- versionCode 36
+ versionCode 37
versionName "1.1.7"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
index 01c19d4..451be44 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
@@ -1071,6 +1071,9 @@ public class LoginActivity extends AppCompatActivity
case R.id.action_license_info:
AboutFragment.display(getSupportFragmentManager());
return true;
+ case R.id.action_help_list:
+ HelpFragment.display(getSupportFragmentManager(), R.string.help_list);
+ return true;
case R.id.action_privacy_policy:
PrivacyFragment.display(getSupportFragmentManager());
return true;
diff --git a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
index b8b1be4..f6c435a 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SendFragment.java
@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Handler;
+import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
@@ -27,6 +28,8 @@ import android.text.InputType;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
@@ -483,4 +486,15 @@ public class SendFragment extends Fragment {
pbProgress.setVisibility(View.GONE);
}
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ inflater.inflate(R.menu.send_menu, menu);
+ super.onCreateOptionsMenu(menu, inflater);
+ }
}
diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
index 607c24d..f88718e 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -163,8 +163,14 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
case R.id.action_help_tx_info:
HelpFragment.display(getSupportFragmentManager(), R.string.help_tx_details);
return true;
- case R.id.action_help_sync:
- HelpFragment.display(getSupportFragmentManager(), R.string.help_sync);
+ case R.id.action_help_wallet:
+ HelpFragment.display(getSupportFragmentManager(), R.string.help_wallet);
+ return true;
+ case R.id.action_details_help:
+ HelpFragment.display(getSupportFragmentManager(), R.string.help_details);
+ return true;
+ case R.id.action_help_send:
+ HelpFragment.display(getSupportFragmentManager(), R.string.help_send);
return true;
default:
return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index f383102..1ef58ea 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -265,6 +265,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4sp"
+ android:backgroundTint="@color/moneroGray"
android:hint="@string/send_notes_hint"
android:imeOptions="actionDone"
android:inputType="textMultiLine"
@@ -283,7 +284,7 @@
diff --git a/app/src/main/res/menu/list_menu.xml b/app/src/main/res/menu/list_menu.xml
index 8ee6343..57f280c 100644
--- a/app/src/main/res/menu/list_menu.xml
+++ b/app/src/main/res/menu/list_menu.xml
@@ -17,8 +17,15 @@
Other personal data is not collected.
+Other personal data is not collected by the app.
+If you use the USD/EUR exchange (optional) functionality, monerujo fetches the exchange + rate through the public API of kraken.com. + See their privacy policy at https://www.kraken.com/legal/privacy for + details on how data in your requests is collected (especially the + section "Information We Collect Automatically").
You need a new Monero Address - great!
+If you need a new Monero Address!
Enter a unique wallet name and password. The password is used for securing your wallet data on the device. Use a strong password - even better use a passphrase.
@@ -22,7 +22,7 @@You already have a Monero Address and want to recover the transactions from the blockchain.
+If you already have a Monero Address and want to recover the transactions from the blockchain!
Enter a unique wallet name and password. The password is used for securing your wallet data on the device. Use a strong password - even better use a passphrase.
Enter your Seed in the field \"Mnemonic Seed\".
@@ -33,7 +33,7 @@
You are recovering your wallet using your keys. If you are recovering your wallet using your keys! Enter a unique wallet name and password. The password is used for securing your wallet data on the device.
Use a strong password - even better use a passphrase.
Enter your Monero Address in the field \"Public Address\" and fill out \"View Key\" and \"Spend Key\". You just want to monitor incoming transactions to a wallet. If you just want to monitor incoming transactions to a wallet! Enter a unique wallet name and password. The password is used for securing your wallet data on the device.
Use a strong password - even better use a passphrase.
Enter your Monero Address in the field \"Public Address\" and fill out the \"View Key\". Here you see your wallets. They are located in the monerujo folder
+ in the internal storage of your device. You can use a file explorer app to see them.
+ You should make backups of this folder on a regular basis to off-device storage in
+ case your device explodes or gets stolen. Select a wallet to open it or press the \"+\" to create a new one.
+ Or select one of the wallet operations: Show the wallet details, seed & keys. Make a QR code for receiving Moneroj. Rename the wallet. Backups are not renamed. Make a copy of the wallet in the backups folder inside the monerujo
+ overwriting previous copies there. Make a backup and delete the wallet afterwards. The copy remains in the backups
+ folder. If you no longer need your backups you should delete them with a file explorer or
+ secure delete app. Help! My wallet balance has disappeared or is unconfirmed! A list of the wallet transactions. In view wallets, only incoming transactions are shown. This is the public address of the wallet you are sending Moneroj to, you can copy this from
+ your clipboard, scan a QR code or enter it manually. Make sure you triple check this to
+ ensure you aren’t sending coins to the wrong address. You can use a Payment ID to identify the reason you sent Monero between two parties. This
+ is fully optional and private. For example it can allow a business to reconcile your
+ transaction with an item you bought.
+ There are a number of ring sizes to choose from in Monerujo. If you are a beginner user
+ we recommend you stick with a ring size of 5. Increasing the ring size above 5 increases
+ the amount of signers in a ring signature, theoretically providing increased plausible
+ deniability. However setting high ring sizes can also make your transaction stand out on
+ the blockchain. This setting determines the speed at which your transaction will be included in the
+ blockchain. A high priority setting will correlate directly with a higher transaction fee
+ and the inverse is true for a low priority. Please note that if you set your transaction to
+ a low priority it can be hours before it is included on the blockchain. The default priority
+ is \"Medium\".Details
+ Receive
+ Rename
+ Backup
+ Archive
+ Scanning
Because Monero likes to keep things private, every time you open a Monerujo wallet we have to
scan the blockchain to see if any new Moneroj have been sent to your wallet, this only
stores information to your phone which belongs to your wallet. Sometimes it can take a while
because you haven’t synced in a long time.
+ The Balance
+
+ Don’t panic! When you send funds from your wallet, some of your balance will temporarily show
+ as unconfirmed.
+ This happens as a result of how Monero is exchanged on the blockchain and how change works.
+ Read more about change at https://getmonero.org/resources/moneropedia/change.html
+ Transaction List
+ Receiver’s address
+ Payment ID
+ Ring size
+ Priority
+