Merge branch 'release-5' of https://github.com/HashEngineering/darkco…

…in-wallet into release-5

wallet/assets/fees-testnet.txt

@@ -1,3 +1,3 @@
-ECONOMIC=1000
-NORMAL=1000
-PRIORITY=2000
+ECONOMIC=10000
+NORMAL=10000
+PRIORITY=20000

wallet/assets/fees.txt

@@ -1,3 +1,3 @@
-ECONOMIC=1000
-NORMAL=1000
-PRIORITY=2000
+ECONOMIC=10000
+NORMAL=10000
+PRIORITY=20000

wallet/res/menu/send_coins_fragment_options.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <item
+        android:id="@+id/send_coins_options_scan"
+        android:icon="@drawable/ic_photo_camera_white_24dp"
+        android:showAsAction="always|withText"
+        android:title="@string/button_scan"/>
     <item
         android:id="@+id/send_coins_options_fee_category"
         android:showAsAction="never"
@@ -24,4 +28,5 @@
         android:id="@+id/send_coins_options_empty"
         android:showAsAction="never"
         android:title="@string/send_coins_options_empty"/>
+
 </menu>

wallet/src/de/schildbach/wallet/Constants.java

@@ -97,6 +97,24 @@ public final static class Files {
     /** Maximum size of backups. Files larger will be rejected. */
     public static final long BACKUP_MAX_CHARS = 10000000;
 
+    private static final String EXPLORE_BASE_URL_PROD = CoinDefinition.BLOCKEXPLORER_BASE_URL_PROD;
+    private static final String EXPLORE_BASE_URL_TEST = CoinDefinition.BLOCKEXPLORER_BASE_URL_TEST;
+
+    /** Base URL for browsing transactions, blocks or addresses. */
+    public static final String EXPLORE_BASE_URL = NETWORK_PARAMETERS.getId().equals(NetworkParameters.ID_MAINNET) ? EXPLORE_BASE_URL_PROD
+            : EXPLORE_BASE_URL_TEST;
+    public static final String EXPLORE_ADDRESS_PATH  = CoinDefinition.BLOCKEXPLORER_ADDRESS_PATH;
+    public static final String EXPLORE_TRANSACTION_PATH  = CoinDefinition.BLOCKEXPLORER_TRANSACTION_PATH;
+    public static final String EXPLORE_BLOCK_PATH  = CoinDefinition.BLOCKEXPLORER_BLOCK_PATH;
+
+    public static final String MIMETYPE_BACKUP_PRIVATE_KEYS = "x-"+CoinDefinition.coinName.toLowerCase()+"/private-keys";
+
+    private static final String BITEASY_API_URL_PROD = CoinDefinition.UNSPENT_API_URL;//"https://api.biteasy.com/blockchain/v1/";
+    private static final String BITEASY_API_URL_TEST = "https://api.biteasy.com/testnet/v1/";
+    /** Base URL for blockchain API. */
+    public static final String BITEASY_API_URL = NETWORK_PARAMETERS.getId().equals(NetworkParameters.ID_MAINNET) ? BITEASY_API_URL_PROD
+            : BITEASY_API_URL_TEST;
+
     /** Currency code for the wallet name resolver. */
     public static final String WALLET_NAME_CURRENCY_CODE = NETWORK_PARAMETERS.getId()
             .equals(NetworkParameters.ID_MAINNET) ? "dash" : "tdash";

wallet/src/de/schildbach/wallet/ui/AddressBookActivity.java

@@ -64,7 +64,7 @@ protected void onCreate(final Bundle savedInstanceState) {
 
 		setContentView(R.layout.address_book_content);
 
-        final FragmentManager fragmentManager = getFragmentManager();
+		final FragmentManager fragmentManager = getFragmentManager();
 
 		walletAddressesFragment = (WalletAddressesFragment) fragmentManager.findFragmentByTag(TAG_LEFT);
 		sendingAddressesFragment = (SendingAddressesFragment) fragmentManager.findFragmentByTag(TAG_RIGHT);

wallet/src/de/schildbach/wallet/ui/WalletBalanceToolbarFragment.java

@@ -96,11 +96,11 @@ public void onCreate(Bundle savedInstanceState)
     }
 
 	@Override
-	public void onAttach(final Context context)
+	public void onAttach(final Activity activity)
 	{
-		super.onAttach(context);
+		super.onAttach(activity);
 
-		this.activity = (Activity) context;
+		this.activity = activity;
 		this.application = (WalletApplication) activity.getApplication();
 		this.config = application.getConfiguration();
 		this.wallet = application.getWallet();

wallet/src/de/schildbach/wallet/ui/preference/DiagnosticsFragment.java

@@ -17,6 +17,7 @@
 
 package de.schildbach.wallet.ui.preference;
 
+import java.io.IOException;
 import java.util.Locale;
 
 import org.bitcoinj.crypto.DeterministicKey;
@@ -26,6 +27,8 @@
 import de.schildbach.wallet.Constants;
 import de.schildbach.wallet.WalletApplication;
 import de.schildbach.wallet.ui.DialogBuilder;
+import de.schildbach.wallet.ui.ReportIssueDialogBuilder;
+import de.schildbach.wallet.util.CrashReporter;
 import de.schildbach.wallet_test.R;
 
 import android.app.Activity;
@@ -43,6 +46,7 @@ public final class DiagnosticsFragment extends PreferenceFragment {
 	private Activity activity;
 	private WalletApplication application;
 
+	private static final String PREFS_KEY_REPORT_ISSUE = "report_issue";
 	private static final String PREFS_KEY_INITIATE_RESET = "initiate_reset";
 	private static final String PREFS_KEY_EXTENDED_PUBLIC_KEY = "extended_public_key";
 
@@ -67,7 +71,10 @@ public void onCreate(final Bundle savedInstanceState) {
     public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen, final Preference preference) {
 		final String key = preference.getKey();
 
-        if (PREFS_KEY_INITIATE_RESET.equals(key)) {
+		if (PREFS_KEY_REPORT_ISSUE.equals(key)) {
+			handleReportIssue();
+			return true;
+		} else if (PREFS_KEY_INITIATE_RESET.equals(key)) {
 			handleInitiateReset();
 			return true;
         } else if (PREFS_KEY_EXTENDED_PUBLIC_KEY.equals(key)) {
@@ -77,7 +84,47 @@ public boolean onPreferenceTreeClick(final PreferenceScreen preferenceScreen, fi
 
 		return false;
 	}
+	private void handleReportIssue()
+	{
+		final ReportIssueDialogBuilder dialog = new ReportIssueDialogBuilder(activity, R.string.report_issue_dialog_title_issue,
+				R.string.report_issue_dialog_message_issue)
+		{
+			@Override
+			protected CharSequence subject()
+			{
+				return Constants.REPORT_SUBJECT_ISSUE + " " + application.packageInfo().versionName;
+			}
+
+			@Override
+			protected CharSequence collectApplicationInfo() throws IOException
+			{
+				final StringBuilder applicationInfo = new StringBuilder();
+				CrashReporter.appendApplicationInfo(applicationInfo, application);
+				return applicationInfo;
+			}
+
+			@Override
+			protected CharSequence collectStackTrace()
+			{
+				return null;
+			}
+
+			@Override
+			protected CharSequence collectDeviceInfo() throws IOException
+			{
+				final StringBuilder deviceInfo = new StringBuilder();
+				CrashReporter.appendDeviceInfo(deviceInfo, activity);
+				return deviceInfo;
+			}
 
+			@Override
+			protected CharSequence collectWalletDump()
+			{
+				return application.getWallet().toString(false, true, true, null);
+			}
+		};
+		dialog.show();
+	}
     private void handleInitiateReset() {
 		final DialogBuilder dialog = new DialogBuilder(activity);
 		dialog.setTitle(R.string.preferences_initiate_reset_title);