Samourai-Wallet · michaelWuensch · Nov 17, 2018 · Nov 18, 2018 · Nov 19, 2018
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
         tools:node="replace" />
 
     <application
-        android:name="android.support.multidex.MultiDexApplication"
+        android:name=".language.App"
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/com/samourai/wallet/AboutActivity.java b/app/src/main/java/com/samourai/wallet/AboutActivity.java
@@ -1,11 +1,11 @@
 package com.samourai.wallet;
 
-import android.app.Activity;
 import android.os.Bundle;
 
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.util.AppUtil;
 
-public class AboutActivity extends Activity {
+public class AboutActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

diff --git a/app/src/main/java/com/samourai/wallet/AddressCalcActivity.java b/app/src/main/java/com/samourai/wallet/AddressCalcActivity.java
@@ -1,6 +1,5 @@
 package com.samourai.wallet;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.pm.ActivityInfo;
@@ -27,6 +26,7 @@
 import com.samourai.wallet.bip47.rpc.PaymentCode;
 import com.samourai.wallet.hd.HD_Address;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.ricochet.RicochetMeta;
 import com.samourai.wallet.segwit.BIP49Util;
 import com.samourai.wallet.segwit.BIP84Util;
@@ -37,7 +37,7 @@
 
 import org.bitcoinj.core.ECKey;
 
-public class AddressCalcActivity extends Activity {
+public class AddressCalcActivity extends BaseActivity {
 
     private EditText edIndex = null;
     private Spinner spType = null;

diff --git a/app/src/main/java/com/samourai/wallet/BalanceActivity.java b/app/src/main/java/com/samourai/wallet/BalanceActivity.java
@@ -76,6 +76,7 @@
 import com.samourai.wallet.hd.HD_Address;
 import com.samourai.wallet.hd.HD_Wallet;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.payload.PayloadUtil;
 import com.samourai.wallet.permissions.PermissionsUtil;
 import com.samourai.wallet.segwit.BIP49Util;
@@ -132,7 +133,7 @@
 
 import info.guardianproject.netcipher.proxy.OrbotHelper;
 
-public class BalanceActivity extends Activity {
+public class BalanceActivity extends BaseActivity {
 
     private final static int SCAN_COLD_STORAGE = 2011;
     private final static int SCAN_QR = 2012;

diff --git a/app/src/main/java/com/samourai/wallet/BatchSendActivity.java b/app/src/main/java/com/samourai/wallet/BatchSendActivity.java
@@ -49,6 +49,7 @@
 import com.samourai.wallet.bip47.rpc.PaymentAddress;
 import com.samourai.wallet.bip47.rpc.PaymentCode;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.segwit.BIP49Util;
 import com.samourai.wallet.segwit.SegwitAddress;
 import com.samourai.wallet.segwit.bech32.Bech32Util;
@@ -92,7 +93,7 @@
 import org.bitcoinj.crypto.MnemonicException;
 import org.bouncycastle.util.encoders.Hex;
 
-public class BatchSendActivity extends Activity {
+public class BatchSendActivity extends BaseActivity {
 
     private final static int SCAN_QR = 2012;
     private final static int FEE_SELECT = 2013;

diff --git a/app/src/main/java/com/samourai/wallet/CreateWalletActivity.java b/app/src/main/java/com/samourai/wallet/CreateWalletActivity.java
@@ -7,7 +7,6 @@
 import android.os.Bundle;
 import android.os.Looper;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.view.View;
@@ -23,6 +22,7 @@
 import com.samourai.wallet.fragments.PassphraseEntryFragment;
 import com.samourai.wallet.fragments.PinEntryFragment;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseFragmentActivity;
 import com.samourai.wallet.payload.PayloadUtil;
 import com.samourai.wallet.util.AddressFactory;
 import com.samourai.wallet.util.AppUtil;
@@ -41,7 +41,7 @@
 import static com.samourai.wallet.R.id.dots;
 
 
-public class CreateWalletActivity extends FragmentActivity implements
+public class CreateWalletActivity extends BaseFragmentActivity implements
         PinEntryFragment.onPinEntryListener,
         PassphraseEntryFragment.onPassPhraseListener {
     private ViewPager wallet_create_viewpager;

diff --git a/app/src/main/java/com/samourai/wallet/ExodusActivity.java b/app/src/main/java/com/samourai/wallet/ExodusActivity.java
@@ -1,11 +1,11 @@
 package com.samourai.wallet;
 
-import android.app.Activity;
 import android.os.Bundle;
 
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.util.TimeOutUtil;
 
-public class ExodusActivity extends Activity {
+public class ExodusActivity extends BaseActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

diff --git a/app/src/main/java/com/samourai/wallet/FeeActivity.java b/app/src/main/java/com/samourai/wallet/FeeActivity.java
@@ -1,7 +1,6 @@
 package com.samourai.wallet;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -17,6 +16,7 @@
 import android.widget.Toast;
 import android.util.Log;
 
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.send.FeeUtil;
 import com.samourai.wallet.send.SuggestedFee;
 import com.samourai.wallet.util.AppUtil;
@@ -26,7 +26,7 @@
 import java.text.NumberFormat;
 import java.util.Locale;
 
-public class FeeActivity extends Activity {
+public class FeeActivity extends BaseActivity {
 
     private Button btLowFee = null;
     private Button btAutoFee = null;

diff --git a/app/src/main/java/com/samourai/wallet/LandingActivity.java b/app/src/main/java/com/samourai/wallet/LandingActivity.java
@@ -1,7 +1,6 @@
 package com.samourai.wallet;
 
 import android.Manifest;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -35,6 +34,7 @@
 import com.samourai.wallet.crypto.DecryptionException;
 import com.samourai.wallet.hd.HD_Wallet;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.payload.PayloadUtil;
 import com.samourai.wallet.permissions.PermissionsUtil;
 import com.samourai.wallet.util.AppUtil;
@@ -53,7 +53,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-public class LandingActivity extends Activity implements PopupMenu.OnMenuItemClickListener {
+public class LandingActivity extends BaseActivity implements PopupMenu.OnMenuItemClickListener {
 
     private ProgressDialog progressDialog = null;
 

diff --git a/app/src/main/java/com/samourai/wallet/MainActivity.java b/app/src/main/java/com/samourai/wallet/MainActivity.java
@@ -1,16 +1,16 @@
 package com.samourai.wallet;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.util.PrefsUtil;
 
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.TestNet3Params;
 //import android.util.Log;
 
-public class MainActivity extends Activity {
+public class MainActivity extends BaseActivity {
 
     private static boolean genesis = false;
 

diff --git a/app/src/main/java/com/samourai/wallet/MainActivity2.java b/app/src/main/java/com/samourai/wallet/MainActivity2.java
@@ -1,7 +1,6 @@
 package com.samourai.wallet;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
@@ -21,6 +20,7 @@
 import com.samourai.wallet.access.AccessFactory;
 import com.samourai.wallet.api.APIFactory;
 import com.samourai.wallet.crypto.AESUtil;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.payload.PayloadUtil;
 import com.samourai.wallet.prng.PRNGFixes;
 import com.samourai.wallet.service.BackgroundManager;
@@ -36,7 +36,7 @@
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.TestNet3Params;
 
-public class MainActivity2 extends Activity {
+public class MainActivity2 extends BaseActivity {
 
     private ProgressDialog progress = null;
 

diff --git a/app/src/main/java/com/samourai/wallet/OpenDimeActivity.java b/app/src/main/java/com/samourai/wallet/OpenDimeActivity.java
@@ -13,7 +13,6 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -59,6 +58,7 @@
 import com.google.zxing.client.android.encode.QRCodeEncoder;
 import com.samourai.wallet.access.AccessFactory;
 import com.samourai.wallet.api.APIFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.send.SweepUtil;
 import com.samourai.wallet.util.AppUtil;
 import com.samourai.wallet.util.BlockExplorerUtil;
@@ -72,7 +72,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class OpenDimeActivity extends Activity {
+public class OpenDimeActivity extends BaseActivity {
 
     static {
         FileSystemFactory.registerFileSystem(new JavaFsFileSystemCreator());

diff --git a/app/src/main/java/com/samourai/wallet/PayNymCalcActivity.java b/app/src/main/java/com/samourai/wallet/PayNymCalcActivity.java
@@ -1,6 +1,5 @@
 package com.samourai.wallet;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.pm.ActivityInfo;
@@ -24,6 +23,7 @@
 import com.samourai.wallet.bip47.BIP47Util;
 import com.samourai.wallet.bip47.rpc.PaymentAddress;
 import com.samourai.wallet.bip47.rpc.PaymentCode;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.segwit.SegwitAddress;
 import com.samourai.wallet.util.AppUtil;
 
@@ -32,7 +32,7 @@
 
 import org.bitcoinj.core.ECKey;
 
-public class PayNymCalcActivity extends Activity {
+public class PayNymCalcActivity extends BaseActivity {
 
     private EditText edPayNym = null;
     private EditText edIndex = null;

diff --git a/app/src/main/java/com/samourai/wallet/PinEntryActivity.java b/app/src/main/java/com/samourai/wallet/PinEntryActivity.java
@@ -1,6 +1,5 @@
 package com.samourai.wallet;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
@@ -26,6 +25,7 @@
 import com.samourai.wallet.crypto.DecryptionException;
 import com.samourai.wallet.hd.HD_Wallet;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.payload.PayloadUtil;
 import com.samourai.wallet.util.AddressFactory;
 import com.samourai.wallet.util.AppUtil;
@@ -46,7 +46,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-public class PinEntryActivity extends Activity {
+public class PinEntryActivity extends BaseActivity {
 
     private Button ta = null;
     private Button tb = null;

diff --git a/app/src/main/java/com/samourai/wallet/ReceiveActivity.java b/app/src/main/java/com/samourai/wallet/ReceiveActivity.java
@@ -18,7 +18,6 @@
 import android.support.transition.TransitionManager;
 import android.support.v4.content.FileProvider;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -44,6 +43,7 @@
 import com.google.zxing.client.android.encode.QRCodeEncoder;
 import com.samourai.wallet.api.APIFactory;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseAppCompatActivity;
 import com.samourai.wallet.segwit.BIP49Util;
 import com.samourai.wallet.segwit.BIP84Util;
 import com.samourai.wallet.util.AddressFactory;
@@ -70,7 +70,7 @@
 import java.util.Locale;
 import java.util.Objects;
 
-public class ReceiveActivity extends AppCompatActivity {
+public class ReceiveActivity extends BaseAppCompatActivity {
 
     private static int imgWidth = 0;
 

diff --git a/app/src/main/java/com/samourai/wallet/RecoveryWordsActivity.java b/app/src/main/java/com/samourai/wallet/RecoveryWordsActivity.java
@@ -1,6 +1,5 @@
 package com.samourai.wallet;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -16,10 +15,11 @@
 import android.widget.TextView;
 
 import com.samourai.wallet.access.AccessFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.util.AppUtil;
 import com.samourai.wallet.util.TimeOutUtil;
 
-public class RecoveryWordsActivity extends Activity {
+public class RecoveryWordsActivity extends BaseActivity {
     private GridView recoveryWordsGrid;
     private Button returnToWallet;
     private CheckBox desclaimerCheckbox;

diff --git a/app/src/main/java/com/samourai/wallet/RestoreSeedWalletActivity.java b/app/src/main/java/com/samourai/wallet/RestoreSeedWalletActivity.java
@@ -6,7 +6,6 @@
 import android.os.Bundle;
 import android.os.Looper;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.view.View;
@@ -22,6 +21,7 @@
 import com.samourai.wallet.fragments.PinEntryFragment;
 import com.samourai.wallet.hd.HD_Wallet;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseFragmentActivity;
 import com.samourai.wallet.payload.PayloadUtil;
 import com.samourai.wallet.util.AddressFactory;
 import com.samourai.wallet.util.AppUtil;
@@ -46,7 +46,7 @@
 import static com.samourai.wallet.R.id.dots;
 
 
-public class RestoreSeedWalletActivity extends FragmentActivity implements
+public class RestoreSeedWalletActivity extends BaseFragmentActivity implements
         PinEntryFragment.onPinEntryListener,
         ImportWalletFragment.onRestoreDataSets {
     private ViewPager wallet_create_viewpager;

diff --git a/app/src/main/java/com/samourai/wallet/SendActivity.java b/app/src/main/java/com/samourai/wallet/SendActivity.java
@@ -57,6 +57,7 @@
 import com.samourai.wallet.bip47.rpc.PaymentAddress;
 import com.samourai.wallet.bip47.rpc.PaymentCode;
 import com.samourai.wallet.hd.HD_WalletFactory;
+import com.samourai.wallet.language.BaseActivity;
 import com.samourai.wallet.payload.PayloadUtil;
 import com.samourai.wallet.ricochet.RicochetActivity;
 import com.samourai.wallet.ricochet.RicochetMeta;
@@ -99,7 +100,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class SendActivity extends Activity {
+public class SendActivity extends BaseActivity {
 
     private final static int SCAN_QR = 2012;
     private final static int RICOCHET = 2013;

diff --git a/app/src/main/java/com/samourai/wallet/SettingsActivity.java b/app/src/main/java/com/samourai/wallet/SettingsActivity.java
@@ -12,15 +12,15 @@
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
 import android.util.Log;
 import android.view.MenuItem;
 //import android.util.Log;
 
+import com.samourai.wallet.language.BasePreferenceActivity;
 import com.samourai.wallet.permissions.PermissionsUtil;
 import com.samourai.wallet.util.AppUtil;
 
-public class SettingsActivity extends PreferenceActivity	{
+public class SettingsActivity extends BasePreferenceActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {