Merge pull request #29 from franciscom0301/testnet

Testnet

app/build.gradle

@@ -7,7 +7,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.2"
     defaultConfig {
-        applicationId "com.xcash.wallet"
+        applicationId "com.xcash.testnetwallet"
         minSdkVersion 17
         targetSdkVersion 26
         versionCode 7

app/proguard-rules.pro

@@ -110,7 +110,7 @@
 #wallet
 -keep class com.my.monero.** {*;}
 
--keep class com.xcash.wallet.aidl.** {*;}
+-keep class com.xcash.testnetwallet.aidl.** {*;}
 
 -keepclassmembernames class com.xcash.models.** { *; }
 

app/src/androidTest/java/com/xcash/wallet/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/xcash/testnetwallet/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.xcash.wallet
+package com.xcash.testnetwallet
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.xcash.wallet", appContext.packageName)
+        assertEquals("com.xcash.testnetwallet", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.xcash.wallet">
+    package="com.xcash.testnetwallet">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -10,11 +10,11 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <permission android:name="com.xcash.wallet.aidl.permission.LOCAL" />
-    <uses-permission android:name="com.xcash.wallet.aidl.permission.LOCAL" />
+    <permission android:name="com.xcash.testnetwallet.aidl.permission.LOCAL" />
+    <uses-permission android:name="com.xcash.testnetwallet.aidl.permission.LOCAL" />
 
     <application
-        android:name="com.xcash.wallet.TheApplication"
+        android:name="com.xcash.testnetwallet.TheApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -33,48 +33,48 @@
         </provider>
 
 
-        <activity android:name="com.xcash.wallet.SplashActivity">
+        <activity android:name="com.xcash.testnetwallet.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.xcash.wallet.ChooseWalletActivity" />
-        <activity android:name="com.xcash.wallet.SetWalletActivity" />
-        <activity android:name="com.xcash.wallet.CreateWalletActivity" />
-        <activity android:name="com.xcash.wallet.ImportWalletActivity" />
-        <activity android:name="com.xcash.wallet.CreateWalletConfirmActivity" />
-        <activity android:name="com.xcash.wallet.MainActivity" />
-        <activity android:name="com.xcash.wallet.WalletManagerActivity" />
-        <activity android:name="com.xcash.wallet.WalletDetailsActivity" />
-        <activity android:name="com.xcash.wallet.WalletDetailsMnemonicWordsActivity" />
-        <activity android:name="com.xcash.wallet.WalletDetailsPrivateKeysActivity" />
-        <activity android:name="com.xcash.wallet.WalletRunningActivity" />
-        <activity android:name="com.xcash.wallet.NodeManagerActivity" />
-        <activity android:name="com.xcash.wallet.PaymentActivity" />
-        <activity android:name="com.xcash.wallet.PaymentConfirmActivity" />
-        <activity android:name="com.xcash.wallet.AddressManagerActivity" />
-        <activity android:name="com.xcash.wallet.AddressAddActivity" />
-        <activity android:name="com.xcash.wallet.LanguageSettingActivity" />
-        <activity android:name="com.xcash.wallet.NodeAddActivity" />
-        <activity android:name="com.xcash.wallet.WebViewActivity" />
-        <activity android:name="com.xcash.wallet.QRCodeActivity" />
-        <activity android:name="com.xcash.wallet.ReceiveActivity" />
-        <activity android:name="com.xcash.wallet.TransactionDetailsActivity" />
-        <activity android:name="com.xcash.wallet.AboutUsActivity" />
+        <activity android:name="com.xcash.testnetwallet.ChooseWalletActivity" />
+        <activity android:name="com.xcash.testnetwallet.SetWalletActivity" />
+        <activity android:name="com.xcash.testnetwallet.CreateWalletActivity" />
+        <activity android:name="com.xcash.testnetwallet.ImportWalletActivity" />
+        <activity android:name="com.xcash.testnetwallet.CreateWalletConfirmActivity" />
+        <activity android:name="com.xcash.testnetwallet.MainActivity" />
+        <activity android:name="com.xcash.testnetwallet.WalletManagerActivity" />
+        <activity android:name="com.xcash.testnetwallet.WalletDetailsActivity" />
+        <activity android:name="com.xcash.testnetwallet.WalletDetailsMnemonicWordsActivity" />
+        <activity android:name="com.xcash.testnetwallet.WalletDetailsPrivateKeysActivity" />
+        <activity android:name="com.xcash.testnetwallet.WalletRunningActivity" />
+        <activity android:name="com.xcash.testnetwallet.NodeManagerActivity" />
+        <activity android:name="com.xcash.testnetwallet.PaymentActivity" />
+        <activity android:name="com.xcash.testnetwallet.PaymentConfirmActivity" />
+        <activity android:name="com.xcash.testnetwallet.AddressManagerActivity" />
+        <activity android:name="com.xcash.testnetwallet.AddressAddActivity" />
+        <activity android:name="com.xcash.testnetwallet.LanguageSettingActivity" />
+        <activity android:name="com.xcash.testnetwallet.NodeAddActivity" />
+        <activity android:name="com.xcash.testnetwallet.WebViewActivity" />
+        <activity android:name="com.xcash.testnetwallet.QRCodeActivity" />
+        <activity android:name="com.xcash.testnetwallet.ReceiveActivity" />
+        <activity android:name="com.xcash.testnetwallet.TransactionDetailsActivity" />
+        <activity android:name="com.xcash.testnetwallet.AboutUsActivity" />
         <activity
-            android:name="com.xcash.wallet.DpopsActivity"
+            android:name="com.xcash.testnetwallet.DpopsActivity"
             android:windowSoftInputMode="adjustResize|stateHidden" />
-        <activity android:name="com.xcash.wallet.DpopsRegisterActivity" />
-        <activity android:name="com.xcash.wallet.DpopsUpdateActivity" />
-        <activity android:name="com.xcash.wallet.DpopsOperationHistoryActivity" />
+        <activity android:name="com.xcash.testnetwallet.DpopsRegisterActivity" />
+        <activity android:name="com.xcash.testnetwallet.DpopsUpdateActivity" />
+        <activity android:name="com.xcash.testnetwallet.DpopsOperationHistoryActivity" />
 
         <service
-            android:name="com.xcash.wallet.aidl.service.WalletService"
+            android:name="com.xcash.testnetwallet.aidl.service.WalletService"
             android:enabled="true"
             android:exported="true"
-            android:permission="com.xcash.wallet.aidl.permission.LOCAL"
+            android:permission="com.xcash.testnetwallet.aidl.permission.LOCAL"
             />
 
 

app/src/main/aidl/com/xcash/wallet/aidl/OnCreateTransactionListener.aidl → app/src/main/aidl/com/xcash/testnetwallet/aidl/OnCreateTransactionListener.aidl

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.xcash.wallet.aidl;
+package com.xcash.testnetwallet.aidl;
 
-import com.xcash.wallet.aidl.Transaction;
+import com.xcash.testnetwallet.aidl.Transaction;
 
 interface OnCreateTransactionListener {
 

app/src/main/aidl/com/xcash/wallet/aidl/OnNormalListener.aidl → app/src/main/aidl/com/xcash/testnetwallet/aidl/OnNormalListener.aidl

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xcash.wallet.aidl;
+package com.xcash.testnetwallet.aidl;
 
 
 interface OnNormalListener {

app/src/main/aidl/com/xcash/wallet/aidl/OnWalletDataListener.aidl → app/src/main/aidl/com/xcash/testnetwallet/aidl/OnWalletDataListener.aidl

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xcash.wallet.aidl;
+package com.xcash.testnetwallet.aidl;
 
-import com.xcash.wallet.aidl.Wallet;
+import com.xcash.testnetwallet.aidl.Wallet;
 
 interface OnWalletDataListener {
 

app/src/main/aidl/com/xcash/wallet/aidl/OnWalletRefreshListener.aidl → app/src/main/aidl/com/xcash/testnetwallet/aidl/OnWalletRefreshListener.aidl

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xcash.wallet.aidl;
+package com.xcash.testnetwallet.aidl;
 
 interface OnWalletRefreshListener {
 

app/src/main/aidl/com/xcash/wallet/aidl/Transaction.aidl → app/src/main/aidl/com/xcash/testnetwallet/aidl/Transaction.aidl

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xcash.wallet.aidl;
+package com.xcash.testnetwallet.aidl;
 
 parcelable Transaction;
 

app/src/main/aidl/com/xcash/wallet/aidl/Wallet.aidl → app/src/main/aidl/com/xcash/testnetwallet/aidl/Wallet.aidl

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xcash.wallet.aidl;
+package com.xcash.testnetwallet.aidl;
 
 parcelable Wallet;
 

app/src/main/aidl/com/xcash/wallet/aidl/WalletOperateManager.aidl → app/src/main/aidl/com/xcash/testnetwallet/aidl/WalletOperateManager.aidl

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xcash.wallet.aidl;
+package com.xcash.testnetwallet.aidl;
 
-import com.xcash.wallet.aidl.OnWalletRefreshListener;
-import com.xcash.wallet.aidl.OnWalletDataListener;
-import com.xcash.wallet.aidl.OnNormalListener;
-import com.xcash.wallet.aidl.OnCreateTransactionListener;
+import com.xcash.testnetwallet.aidl.OnWalletRefreshListener;
+import com.xcash.testnetwallet.aidl.OnWalletDataListener;
+import com.xcash.testnetwallet.aidl.OnNormalListener;
+import com.xcash.testnetwallet.aidl.OnCreateTransactionListener;
 
 interface WalletOperateManager {
 

app/src/main/java/com/xcash/adapters/listviewadapter/Menu_ListViewAdapter.java

@@ -25,7 +25,7 @@
 
 import com.xcash.base.BaseActivity;
 import com.xcash.models.local.KeyValueItem;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xcash/adapters/listviewadapter/Normal_ListViewAdapter.java

@@ -25,7 +25,7 @@
 
 import com.xcash.base.BaseActivity;
 import com.xcash.models.local.KeyValueItem;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xcash/adapters/listviewadapter/Search_History_ListViewAdapter.java

@@ -25,7 +25,7 @@
 import android.widget.TextView;
 
 import com.xcash.base.BaseActivity;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xcash/adapters/recyclerviewadapter/AddressManagerActivity_RecyclerViewAdapter.java

@@ -24,7 +24,7 @@
 import com.xcash.base.recyclerviewlibrary.adapters.UnLoadMoreRecyclerViewAdapter;
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
 import com.xcash.utils.database.entity.AddressBook;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.List;
 

app/src/main/java/com/xcash/adapters/recyclerviewadapter/DpopsActivity_RecyclerViewAdapter.java

@@ -24,7 +24,7 @@
 import com.xcash.base.recyclerviewlibrary.adapters.UnLoadMoreRecyclerViewAdapter;
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
 import com.xcash.models.Delegate;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.List;
 

app/src/main/java/com/xcash/adapters/recyclerviewadapter/DpopsOperationHistoryActivity_RecyclerViewAdapter.java

@@ -27,8 +27,8 @@
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
 import com.xcash.utils.StringTool;
 import com.xcash.utils.database.entity.OperationHistory;
-import com.xcash.wallet.R;
-import com.xcash.wallet.uihelp.ActivityHelp;
+import com.xcash.testnetwallet.R;
+import com.xcash.testnetwallet.uihelp.ActivityHelp;
 
 import java.util.List;
 

app/src/main/java/com/xcash/adapters/recyclerviewadapter/LanguageSettingActivity_RecyclerViewAdapter.java

@@ -24,7 +24,7 @@
 import com.xcash.base.BaseActivity;
 import com.xcash.base.recyclerviewlibrary.adapters.UnLoadMoreRecyclerViewAdapter;
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.List;
 

app/src/main/java/com/xcash/adapters/recyclerviewadapter/NodeManagerActivity_RecyclerViewAdapter.java

@@ -25,7 +25,7 @@
 import com.xcash.base.recyclerviewlibrary.adapters.UnLoadMoreRecyclerViewAdapter;
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
 import com.xcash.utils.database.entity.Node;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.List;
 

app/src/main/java/com/xcash/adapters/recyclerviewadapter/Transaction_Default_RecyclerViewAdapter.java

@@ -27,8 +27,8 @@
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
 import com.xcash.utils.StringTool;
 import com.xcash.utils.database.entity.TransactionInfo;
-import com.xcash.wallet.R;
-import com.xcash.wallet.aidl.manager.XManager;
+import com.xcash.testnetwallet.R;
+import com.xcash.testnetwallet.aidl.manager.XManager;
 
 import java.util.List;
 

app/src/main/java/com/xcash/adapters/recyclerviewadapter/WalletManagerActivity_RecyclerViewAdapter.java

@@ -37,9 +37,9 @@
 import com.xcash.base.recyclerviewlibrary.adapters.UnLoadMoreRecyclerViewAdapter;
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
 import com.xcash.utils.database.entity.Wallet;
-import com.xcash.wallet.R;
-import com.xcash.wallet.WalletDetailsActivity;
-import com.xcash.wallet.uihelp.ActivityHelp;
+import com.xcash.testnetwallet.R;
+import com.xcash.testnetwallet.WalletDetailsActivity;
+import com.xcash.testnetwallet.uihelp.ActivityHelp;
 
 import java.util.List;
 

app/src/main/java/com/xcash/adapters/viewpageradapter/ImportWalletActivity_ViewPagerAdapter.java

@@ -22,10 +22,10 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import com.xcash.wallet.fragment.BaseFragment;
-import com.xcash.wallet.fragment.ImportWalletActivity_Fragment_Keys;
-import com.xcash.wallet.fragment.ImportWalletActivity_Fragment_Mnemonic;
-import com.xcash.wallet.uihelp.ActivityHelp;
+import com.xcash.testnetwallet.fragment.BaseFragment;
+import com.xcash.testnetwallet.fragment.ImportWalletActivity_Fragment_Keys;
+import com.xcash.testnetwallet.fragment.ImportWalletActivity_Fragment_Mnemonic;
+import com.xcash.testnetwallet.uihelp.ActivityHelp;
 
 public class ImportWalletActivity_ViewPagerAdapter extends FragmentStatePagerAdapter {
 

app/src/main/java/com/xcash/adapters/viewpageradapter/WalletRunningActivity_ViewPagerAdapter.java

@@ -23,10 +23,10 @@
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import com.xcash.utils.database.entity.Wallet;
-import com.xcash.wallet.WalletRunningActivity;
-import com.xcash.wallet.fragment.BaseFragment;
-import com.xcash.wallet.fragment.WalletRunningActivity_Fragment_Default;
-import com.xcash.wallet.uihelp.ActivityHelp;
+import com.xcash.testnetwallet.WalletRunningActivity;
+import com.xcash.testnetwallet.fragment.BaseFragment;
+import com.xcash.testnetwallet.fragment.WalletRunningActivity_Fragment_Default;
+import com.xcash.testnetwallet.uihelp.ActivityHelp;
 
 
 public class WalletRunningActivity_ViewPagerAdapter extends FragmentStatePagerAdapter {

app/src/main/java/com/xcash/base/recyclerviewlibrary/adapters/LoadMoreLayerRecyclerViewAdapter.java

@@ -22,7 +22,7 @@
 
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
 import com.xcash.base.recyclerviewlibrary.models.ViewLayerItem;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xcash/base/recyclerviewlibrary/adapters/LoadMoreRecyclerViewAdapter.java

@@ -21,7 +21,7 @@
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xcash/base/recyclerviewlibrary/adapters/UnLoadMoreRecyclerViewAdapter.java

@@ -21,7 +21,7 @@
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xcash/base/recyclerviewlibrary/views/BaseRecyclerViewFromFrameLayout.java

@@ -31,7 +31,7 @@
 
 import com.xcash.base.recyclerviewlibrary.adapters.BaseRecyclerViewAdapter;
 import com.xcash.base.recyclerviewlibrary.models.ViewItem;
-import com.xcash.wallet.R;
+import com.xcash.testnetwallet.R;
 
 public class BaseRecyclerViewFromFrameLayout extends FrameLayout {
 

app/src/main/java/com/xcash/base/utils/CatchBugManager.java

@@ -17,7 +17,7 @@
 
 import android.app.Application;
 
-import com.xcash.wallet.TheApplication;
+import com.xcash.testnetwallet.TheApplication;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/com/xcash/models/local/DelayVote.java

@@ -16,7 +16,7 @@
  package com.xcash.models.local;
 
 
- import com.xcash.wallet.aidl.OnNormalListener;
+ import com.xcash.testnetwallet.aidl.OnNormalListener;
 
  public class DelayVote {