Merge pull request #4 from CryptoAxl/master

Normalize package name

gradle.properties

@@ -1 +1,2 @@
-org.gradle.jvmargs=-Xmx2560M
+org.gradle.jvmargs=-Xmx2560M
+org.gradle.configureondemand=false

wallet/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "27.0.3"
 
     defaultConfig {
-        applicationId "co.com.dimecoin.wallet"
+        applicationId "com.dimecoinnetwork.wallet"
         minSdkVersion 19
         targetSdkVersion 27
         versionCode 6
@@ -23,7 +23,7 @@ android {
             debuggable true
         }
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-android.txt'
         }
     }

wallet/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	package="co.com.dimecoin.wallet"
+	package="com.dimecoinnetwork.wallet"
 	android:installLocation="internalOnly">
 
 	<uses-permission android:name="android.permission.INTERNET" />
@@ -48,20 +48,20 @@
 		android:xlargeScreens="true" />
 
 	<application
-		android:name="de.schildbach.wallet.WalletApplication"
+		android:name="com.dimecoinnetwork.wallet.WalletApplication"
 		android:allowBackup="false"
 		android:hardwareAccelerated="true"
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:theme="@style/My.Theme">
         <activity
-                android:name="de.schildbach.wallet.ui.WalletActivity"
+                android:name="com.dimecoinnetwork.wallet.ui.WalletActivity"
                 android:configChanges="keyboard|keyboardHidden"
                 android:launchMode="singleTask" />
 
 		<activity-alias
-			android:name="de.schildbach.wallet.WalletActivity"
-			android:targetActivity="de.schildbach.wallet.ui.WalletActivity" >
+			android:name="com.dimecoinnetwork.wallet.WalletActivity"
+			android:targetActivity="com.dimecoinnetwork.wallet.ui.WalletActivity" >
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 
@@ -77,7 +77,7 @@
 		</activity-alias>
 
 		<activity
-			android:name="de.schildbach.wallet.ui.SendCoinsActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.SendCoinsActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/send_coins_activity_title"
 			android:screenOrientation="behind"
@@ -113,41 +113,41 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name="de.schildbach.wallet.ui.SendCoinsQrActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.SendCoinsQrActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:theme="@android:style/Theme.Translucent.NoTitleBar" >
 		</activity>
 		<activity
-			android:name="de.schildbach.wallet.ui.RequestCoinsActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.RequestCoinsActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/request_coins_activity_title"
 			android:screenOrientation="behind"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
-			android:name="de.schildbach.wallet.ui.AddressBookActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.AddressBookActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/address_book_activity_title"
 			android:screenOrientation="behind" />
 		<activity
-			android:name="de.schildbach.wallet.ui.ExchangeRatesActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.ExchangeRatesActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/exchange_rates_activity_title"
 			android:screenOrientation="behind" />
 		<activity
-			android:name="de.schildbach.wallet.ui.NetworkMonitorActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.NetworkMonitorActivity"
 			android:configChanges="keyboard|keyboardHidden"
 			android:label="@string/network_monitor_activity_title"
 			android:screenOrientation="behind" />
 		<activity
-			android:name="de.schildbach.wallet.ui.PreferencesActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.PreferencesActivity"
 			android:label="@string/preferences_activity_title"
 			android:screenOrientation="behind" />
 		<activity
-			android:name="de.schildbach.wallet.ui.AboutActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.AboutActivity"
 			android:label="@string/about_title"
 			android:screenOrientation="behind" />
 		<activity
-			android:name="de.schildbach.wallet.ui.ImportKeysActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.ImportKeysActivity"
 			android:configChanges="orientation|keyboard|keyboardHidden"
 			android:theme="@style/My.Theme.Dialog" >
 			<intent-filter android:label="@string/import_keys_intent_filter_action" >
@@ -160,7 +160,7 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name="de.schildbach.wallet.ui.ScanActivity"
+			android:name="com.dimecoinnetwork.wallet.ui.ScanActivity"
 			android:configChanges="orientation|keyboard|keyboardHidden"
 			android:screenOrientation="landscape"
 			android:stateNotNeeded="true"
@@ -177,17 +177,17 @@
 		</provider>
         <!-- Need to update this for the coin -->
 		<provider
-			android:name="de.schildbach.wallet.AddressBookProvider"
-			android:authorities="co.com.dimecoin.wallet.address_book"
+			android:name="com.dimecoinnetwork.wallet.AddressBookProvider"
+			android:authorities="com.dimecoinnetwork.wallet.address_book"
 			android:exported="false" />
         <!-- Need to update this for the coin -->
 		<provider
-			android:name="de.schildbach.wallet.ExchangeRatesProvider"
-			android:authorities="co.com.dimecoin.wallet.exchange_rates"
+			android:name="com.dimecoinnetwork.wallet.ExchangeRatesProvider"
+			android:authorities="com.dimecoinnetwork.wallet.exchange_rates"
 			android:exported="false" />
 
 		<receiver
-			android:name="de.schildbach.wallet.WalletBalanceWidgetProvider"
+			android:name="com.dimecoinnetwork.wallet.WalletBalanceWidgetProvider"
 			android:label="Dimecoin Wallet Balance" >
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -199,13 +199,13 @@
 		</receiver>
 
 		<service
-			android:name="de.schildbach.wallet.service.BlockchainServiceImpl"
+			android:name="com.dimecoinnetwork.wallet.service.BlockchainServiceImpl"
 			android:exported="false" />
 		<service
-			android:name="de.schildbach.wallet.offline.AcceptBluetoothService"
+			android:name="com.dimecoinnetwork.wallet.offline.AcceptBluetoothService"
 			android:exported="false" />
 
-		<receiver android:name="de.schildbach.wallet.service.AutosyncReceiver" >
+		<receiver android:name="com.dimecoinnetwork.wallet.service.AutosyncReceiver" >
 			<intent-filter>
 				<action android:name="android.intent.action.BOOT_COMPLETED" />
 			</intent-filter>

wallet/src/main/cpp/Application.mk

@@ -1,2 +1,2 @@
 APP_ABI := all
-APP_STL                 := stlport_static
+APP_STL                 := c++_static

wallet/src/main/java/de/schildbach/wallet/AddressBookProvider.java → wallet/src/main/java/com/dimecoinnetwork/wallet/AddressBookProvider.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet;
+package com.dimecoinnetwork.wallet;
 
 import java.util.List;
 

wallet/src/main/java/de/schildbach/wallet/Configuration.java → wallet/src/main/java/com/dimecoinnetwork/wallet/Configuration.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet;
+package com.dimecoinnetwork.wallet;
 
 import java.math.BigInteger;
 
@@ -28,7 +28,7 @@
 import android.content.SharedPreferences.Editor;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.text.format.DateUtils;
-import de.schildbach.wallet.ExchangeRatesProvider.ExchangeRate;
+import com.dimecoinnetwork.wallet.ExchangeRatesProvider.ExchangeRate;
 
 /**
  * @author Andreas Schildbach

wallet/src/main/java/de/schildbach/wallet/Constants.java → wallet/src/main/java/com/dimecoinnetwork/wallet/Constants.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet;
+package com.dimecoinnetwork.wallet;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -27,8 +27,6 @@
 import com.google.bitcoin.params.MainNetParams;
 import com.google.bitcoin.params.TestNet3Params;
 import com.google.bitcoin.core.CoinDefinition;
-import co.com.dimecoin.wallet.R;
-
 
 
 /**

wallet/src/main/java/de/schildbach/wallet/ExchangeRatesProvider.java → wallet/src/main/java/com/dimecoinnetwork/wallet/ExchangeRatesProvider.java

@@ -15,13 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet;
+package com.dimecoinnetwork.wallet;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -33,8 +32,7 @@
 import javax.annotation.Nonnull;
 
 import com.google.bitcoin.core.CoinDefinition;
-import org.json.JSONArray;
-import org.json.JSONException;
+
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,8 +45,8 @@
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
 import android.text.format.DateUtils;
-import de.schildbach.wallet.util.GenericUtils;
-import de.schildbach.wallet.util.Io;
+import com.dimecoinnetwork.wallet.util.GenericUtils;
+import com.dimecoinnetwork.wallet.util.Io;
 
 /**
  * @author Andreas Schildbach

wallet/src/main/java/de/schildbach/wallet/PaymentIntent.java → wallet/src/main/java/com/dimecoinnetwork/wallet/PaymentIntent.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet;
+package com.dimecoinnetwork.wallet;
 
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -36,8 +36,8 @@
 import com.google.bitcoin.script.ScriptBuilder;
 import com.google.bitcoin.uri.BitcoinURI;
 
-import de.schildbach.wallet.util.Bluetooth;
-import de.schildbach.wallet.util.GenericUtils;
+import com.dimecoinnetwork.wallet.util.Bluetooth;
+import com.dimecoinnetwork.wallet.util.GenericUtils;
 
 /**
  * @author Andreas Schildbach

wallet/src/main/java/de/schildbach/wallet/WalletApplication.java → wallet/src/main/java/com/dimecoinnetwork/wallet/WalletApplication.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet;
+package com.dimecoinnetwork.wallet;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -65,13 +65,12 @@
 import com.google.bitcoin.utils.Threading;
 import com.google.bitcoin.wallet.WalletFiles;
 
-import de.schildbach.wallet.service.BlockchainService;
-import de.schildbach.wallet.service.BlockchainServiceImpl;
-import de.schildbach.wallet.util.CrashReporter;
-import de.schildbach.wallet.util.Io;
-import de.schildbach.wallet.util.LinuxSecureRandom;
-import de.schildbach.wallet.util.WalletUtils;
-import co.com.dimecoin.wallet.R;
+import com.dimecoinnetwork.wallet.service.BlockchainService;
+import com.dimecoinnetwork.wallet.service.BlockchainServiceImpl;
+import com.dimecoinnetwork.wallet.util.CrashReporter;
+import com.dimecoinnetwork.wallet.util.Io;
+import com.dimecoinnetwork.wallet.util.LinuxSecureRandom;
+import com.dimecoinnetwork.wallet.util.WalletUtils;
 
 
 /**

wallet/src/main/java/de/schildbach/wallet/WalletBalanceWidgetProvider.java → wallet/src/main/java/com/dimecoinnetwork/wallet/WalletBalanceWidgetProvider.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet;
+package com.dimecoinnetwork.wallet;
 
 import java.math.BigInteger;
 
@@ -34,13 +34,12 @@
 import com.google.bitcoin.core.Wallet;
 import com.google.bitcoin.core.Wallet.BalanceType;
 
-import de.schildbach.wallet.ui.RequestCoinsActivity;
-import de.schildbach.wallet.ui.SendCoinsActivity;
-import de.schildbach.wallet.ui.SendCoinsQrActivity;
-import de.schildbach.wallet.ui.WalletActivity;
-import de.schildbach.wallet.util.GenericUtils;
-import de.schildbach.wallet.util.WalletUtils;
-import co.com.dimecoin.wallet.R;
+import com.dimecoinnetwork.wallet.ui.RequestCoinsActivity;
+import com.dimecoinnetwork.wallet.ui.SendCoinsActivity;
+import com.dimecoinnetwork.wallet.ui.SendCoinsQrActivity;
+import com.dimecoinnetwork.wallet.ui.WalletActivity;
+import com.dimecoinnetwork.wallet.util.GenericUtils;
+import com.dimecoinnetwork.wallet.util.WalletUtils;
 
 
 /**

wallet/src/main/java/de/schildbach/wallet/camera/CameraManager.java → wallet/src/main/java/com/dimecoinnetwork/wallet/camera/CameraManager.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet.camera;
+package com.dimecoinnetwork.wallet.camera;
 
 import java.io.IOException;
 import java.util.ArrayList;

wallet/src/main/java/de/schildbach/wallet/offline/AcceptBluetoothService.java → wallet/src/main/java/com/dimecoinnetwork/wallet/offline/AcceptBluetoothService.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet.offline;
+package com.dimecoinnetwork.wallet.offline;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,7 +36,7 @@
 import com.google.bitcoin.core.VerificationException;
 import com.google.bitcoin.core.Wallet;
 
-import de.schildbach.wallet.WalletApplication;
+import com.dimecoinnetwork.wallet.WalletApplication;
 
 /**
  * @author Andreas Schildbach

wallet/src/main/java/de/schildbach/wallet/offline/AcceptBluetoothThread.java → wallet/src/main/java/com/dimecoinnetwork/wallet/offline/AcceptBluetoothThread.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet.offline;
+package com.dimecoinnetwork.wallet.offline;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -42,8 +42,8 @@
 import com.google.bitcoin.core.Transaction;
 import com.google.protobuf.ByteString;
 
-import de.schildbach.wallet.Constants;
-import de.schildbach.wallet.util.Bluetooth;
+import com.dimecoinnetwork.wallet.Constants;
+import com.dimecoinnetwork.wallet.util.Bluetooth;
 
 /**
  * @author Shahar Livne

wallet/src/main/java/de/schildbach/wallet/offline/DirectPaymentTask.java → wallet/src/main/java/com/dimecoinnetwork/wallet/offline/DirectPaymentTask.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.schildbach.wallet.offline;
+package com.dimecoinnetwork.wallet.offline;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -45,9 +45,9 @@
 import com.google.bitcoin.script.ScriptBuilder;
 import com.google.protobuf.ByteString;
 
-import de.schildbach.wallet.Constants;
-import de.schildbach.wallet.PaymentIntent;
-import de.schildbach.wallet.util.Bluetooth;
+import com.dimecoinnetwork.wallet.Constants;
+import com.dimecoinnetwork.wallet.PaymentIntent;
+import com.dimecoinnetwork.wallet.util.Bluetooth;
 
 /**
  * @author Andreas Schildbach