(
getActivity(),
android.R.layout.simple_spinner_item,
listSymbols
- );
+ );*/
- if (mSpinner != null) {
+ /*if (mSpinner != null) {
arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(arrayAdapter);
- }
+ }*/
}
private void loadWebView(WebView webView, int size, String encryptText) {
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java b/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java
index d2acd04..02d8621 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/SettingsActivity.java
@@ -13,16 +13,13 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings);
- mToolbar = (Toolbar) findViewById(R.id.toolbar);
+ mToolbar = findViewById(R.id.toolbar);
setSupportActionBar(mToolbar);
- mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- onBackPressed();
- }
- });
+ mToolbar.setNavigationOnClickListener(v -> onBackPressed());
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
+
}
}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java b/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java
index 7e5f71a..0b491d5 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/SettingsFragment.java
@@ -4,12 +4,8 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
public class SettingsFragment extends PreferenceFragmentCompat {
@@ -19,14 +15,17 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
setPreferencesFromResource(R.xml.preferences, rootKey);
Preference preference = findPreference("currency_setting");
- preference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- Intent intent = new Intent();
- intent.putExtra("setting_changed", "currency_setting");
- getActivity().setResult(Activity.RESULT_OK, intent);
- return true;
- }
+ preference.setOnPreferenceChangeListener((preference1, newValue) -> {
+ Intent intent = new Intent();
+ intent.putExtra("setting_changed", "currency_setting");
+ getActivity().setResult(Activity.RESULT_OK, intent);
+ return true;
+ });
+
+ Preference pinPreference = findPreference("pin_settings");
+ pinPreference.setOnPreferenceClickListener(p -> {
+ getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new PinSettingsFragment()).addToBackStack(null).commit();
+ return true;
});
}
}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java b/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java
index 8549d44..78b2851 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/SignUpButtonActivity.java
@@ -1,38 +1,23 @@
package com.bitshares.bitshareswallet;
-import android.annotation.SuppressLint;
import android.content.Intent;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
-import android.os.Handler;
-import android.view.MotionEvent;
-import android.view.View;
+import android.support.v7.app.AppCompatActivity;
-/**
- * An example full-screen activity that shows and hides the system UI (i.e.
- * status bar and navigation/system bar) with user interaction.
- */
public class SignUpButtonActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_up_button);
- findViewById(R.id.sign_up_button).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(SignUpButtonActivity.this, CreateAccountActivity.class);
- startActivity(intent);
- }
+ findViewById(R.id.sign_up_button).setOnClickListener(v -> {
+ Intent intent = new Intent(SignUpButtonActivity.this, CreateAccountActivity.class);
+ startActivity(intent);
});
- findViewById(R.id.buttonLogin).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(SignUpButtonActivity.this, ModelSelectActivity.class);
- startActivity(intent);
- }
+ findViewById(R.id.buttonLogin).setOnClickListener(v -> {
+ Intent intent = new Intent(SignUpButtonActivity.this, ModelSelectActivity.class);
+ startActivity(intent);
});
}
}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java b/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java
index 1ed8c02..14b0395 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/TransactionSellBuyFragment.java
@@ -446,49 +446,28 @@ public void onReject() {
private void initFee() {
isAssetObjIsInit = false;
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- btsAssetObj = BitsharesWalletWraper.getInstance().lookup_asset_symbols("BTS");
- baseAssetObj = BitsharesWalletWraper.getInstance().lookup_asset_symbols(baseAsset);
- quoteAssetObj = BitsharesWalletWraper.getInstance().lookup_asset_symbols(quoteAsset);
- globalPropertyObject = BitsharesWalletWraper.getInstance().get_global_properties();
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- isAssetObjIsInit = true;
- }
- });
- } catch (Exception e) {
- e.printStackTrace();
- }
+ new Thread(() -> {
+ try {
+ btsAssetObj = BitsharesWalletWraper.getInstance().lookup_asset_symbols("BTS");
+ baseAssetObj = BitsharesWalletWraper.getInstance().lookup_asset_symbols(baseAsset);
+ quoteAssetObj = BitsharesWalletWraper.getInstance().lookup_asset_symbols(quoteAsset);
+ globalPropertyObject = BitsharesWalletWraper.getInstance().get_global_properties();
+ getActivity().runOnUiThread(() -> isAssetObjIsInit = true);
+ } catch (Exception e) {
+ e.printStackTrace();
}
}).start();
}
private void buy(final double rate, final double amount, final int timeSec) {
mProcessHud.show();
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- BitsharesWalletWraper.getInstance().buy(quoteAsset, baseAsset, rate, amount, timeSec);
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mProcessHud.dismiss();
- }
- });
- } catch (Exception e) {
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- mProcessHud.dismiss();
- }
- });
- e.printStackTrace();
- }
+ new Thread(() -> {
+ try {
+ BitsharesWalletWraper.getInstance().buy(quoteAsset, baseAsset, rate, amount, timeSec);
+ getActivity().runOnUiThread(() -> mProcessHud.dismiss());
+ } catch (Exception e) {
+ getActivity().runOnUiThread(() -> mProcessHud.dismiss());
+ e.printStackTrace();
}
}).start();
}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java b/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java
index 090770d..8e3363b 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/TransactionsFragment.java
@@ -28,14 +28,6 @@
* create an instance of this fragment.
*/
public class TransactionsFragment extends BaseFragment {
- // TODO: Rename parameter arguments, choose names that match
- // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
- private static final String ARG_PARAM1 = "param1";
- private static final String ARG_PARAM2 = "param2";
-
- // TODO: Rename and change types of parameters
- private String mParam1;
- private String mParam2;
private OnFragmentInteractionListener mListener;
@@ -81,31 +73,15 @@ public TransactionsFragment() {
// Required empty public constructor
}
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment TransactionsFragment.
- */
- // TODO: Rename and change types and number of parameters
- public static TransactionsFragment newInstance(String param1, String param2) {
+
+ public static TransactionsFragment newInstance() {
TransactionsFragment fragment = new TransactionsFragment();
- Bundle args = new Bundle();
- args.putString(ARG_PARAM1, param1);
- args.putString(ARG_PARAM2, param2);
- fragment.setArguments(args);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (getArguments() != null) {
- mParam1 = getArguments().getString(ARG_PARAM1);
- mParam2 = getArguments().getString(ARG_PARAM2);
- }
}
@Override
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java b/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java
index e3533c7..1a1ccae 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/WalletFragment.java
@@ -27,29 +27,8 @@
import butterknife.BindView;
import butterknife.ButterKnife;
-
-/**
- * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link OnFragmentInteractionListener} interface
- * to handle interaction events.
- * Use the {@link WalletFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
public class WalletFragment extends BaseFragment {
- // TODO: Rename parameter arguments, choose names that match
- // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
- private static final String ARG_PARAM1 = "param1";
- private static final String ARG_PARAM2 = "param2";
-
- // TODO: Rename and change types of parameters
- private String mParam1;
- private String mParam2;
-
- private OnFragmentInteractionListener mListener;
-
private BtsFragmentPageAdapter mWalletFragmentPageAdapter;
- private Handler mHandler = new Handler();
private SendFragment mSendFragment;
@@ -64,7 +43,7 @@ public WalletFragment() {
public void onNewIntent(Intent intent){
String strAction = intent.getStringExtra("action");
- if (TextUtils.isEmpty(strAction) == false) {
+ if (!TextUtils.isEmpty(strAction)) {
mViewPager.setCurrentItem(2);
String strName = intent.getStringExtra("name");
int nAmount = Integer.valueOf(intent.getStringExtra("amount"));
@@ -73,31 +52,13 @@ public void onNewIntent(Intent intent){
}
}
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment WalletFragment.
- */
- // TODO: Rename and change types and number of parameters
- public static WalletFragment newInstance(String param1, String param2) {
- WalletFragment fragment = new WalletFragment();
- Bundle args = new Bundle();
- args.putString(ARG_PARAM1, param1);
- args.putString(ARG_PARAM2, param2);
- fragment.setArguments(args);
- return fragment;
+ public static WalletFragment newInstance() {
+ return new WalletFragment();
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (getArguments() != null) {
- mParam1 = getArguments().getString(ARG_PARAM1);
- mParam2 = getArguments().getString(ARG_PARAM2);
- }
}
@Override
@@ -187,10 +148,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
ButterKnife.bind(this, view);
Resources res = getResources();
mWalletFragmentPageAdapter = new BtsFragmentPageAdapter(getFragmentManager());
- mWalletFragmentPageAdapter.addFragment(BalancesFragment.newInstance("", ""), res.getString(R.string.tab_balances));
- mWalletFragmentPageAdapter.addFragment(TransactionsFragment.newInstance("", ""), res.getString(R.string.tab_transactions));
- mSendFragment = SendFragment.newInstance("", "");
+ mSendFragment = SendFragment.newInstance();
mWalletFragmentPageAdapter.addFragment(mSendFragment, res.getString(R.string.tab_send));
+ mWalletFragmentPageAdapter.addFragment(TransactionsFragment.newInstance(), res.getString(R.string.tab_transactions));
+ mWalletFragmentPageAdapter.addFragment(BalancesFragment.newInstance(), res.getString(R.string.tab_balances));
+ mWalletFragmentPageAdapter.addFragment(ReceiveFragment.newInstance(), res.getString(R.string.tab_receive));
mViewPager.setAdapter(mWalletFragmentPageAdapter);
initPager(mViewPager, mWalletFragmentPageAdapter);
@@ -218,42 +180,13 @@ public void onTabReselected(TabLayout.Tab tab) {
return view;
}
- // TODO: Rename method, update argument and hook method into UI event
- public void onButtonPressed(Uri uri) {
- if (mListener != null) {
- mListener.onFragmentInteraction(uri);
- }
- }
-
@Override
public void onAttach(Context context) {
super.onAttach(context);
- if (context instanceof OnFragmentInteractionListener) {
- mListener = (OnFragmentInteractionListener) context;
- } else {
-// throw new RuntimeException(context.toString()
-// + " must implement OnFragmentInteractionListener");
- }
}
@Override
public void onDetach() {
super.onDetach();
- mListener = null;
- }
-
- /**
- * This interface must be implemented by activities that contain this
- * fragment to allow an interaction in this fragment to be communicated
- * to the activity and potentially other fragments contained in that
- * activity.
- *
- * See the Android Training lesson Communicating with Other Fragments for more information.
- */
- public interface OnFragmentInteractionListener {
- // TODO: Update argument type and name
- void onFragmentInteraction(Uri uri);
}
}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java b/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java
index 2c40695..3b3c160 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/repository/MarketTickerRepository.java
@@ -2,20 +2,16 @@
import android.arch.lifecycle.LiveData;
import android.arch.lifecycle.MediatorLiveData;
-import android.util.Pair;
import com.bitshares.bitshareswallet.BitsharesApplication;
import com.bitshares.bitshareswallet.R;
import com.bitshares.bitshareswallet.market.MarketTicker;
import com.bitshares.bitshareswallet.room.BitsharesAssetObject;
-import com.bitshares.bitshareswallet.room.BitsharesBalanceAsset;
import com.bitshares.bitshareswallet.room.BitsharesDao;
import com.bitshares.bitshareswallet.room.BitsharesMarketTicker;
import com.bitshares.bitshareswallet.wallet.BitsharesWalletWraper;
import com.bitshares.bitshareswallet.wallet.exception.NetworkStatusException;
import com.bitshares.bitshareswallet.wallet.graphene.chain.asset_object;
-import com.bitshares.bitshareswallet.wallet.graphene.chain.object_id;
-import com.bitshares.bitshareswallet.wallet.graphene.chain.utils;
import com.bituniverse.network.Resource;
import java.util.ArrayList;
@@ -27,12 +23,8 @@
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
-/**
- * Created by lorne on 02/11/2017.
- */
-
public class MarketTickerRepository {
- BitsharesDao bitsharesDao;
+ private BitsharesDao bitsharesDao;
private MediatorLiveData>> result = new MediatorLiveData<>();
public MarketTickerRepository() {
@@ -59,10 +51,9 @@ private boolean shouldFetch(List bitsharesMarketTickerLis
private void fetchFromNetwork(final LiveData> dbSource) {
result.addSource(dbSource, newData -> result.setValue(Resource.loading(newData)));
- // 向远程获取数据，并进行存储
Flowable.just(0)
.subscribeOn(Schedulers.io())
- .map(integer -> { // 获取asset list
+ .map(integer -> {
fetchMarketTicker();
return 0;
}).observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/util/Safe.java b/app/src/main/java/com/bitshares/bitshareswallet/util/Safe.java
new file mode 100644
index 0000000..8a9d53c
--- /dev/null
+++ b/app/src/main/java/com/bitshares/bitshareswallet/util/Safe.java
@@ -0,0 +1,15 @@
+package com.bitshares.bitshareswallet.util;
+
+public class Safe {
+
+ public static String encryptDecrypt(String input, char[] key) {
+ StringBuilder output = new StringBuilder();
+
+ for(int i = 0; i < input.length(); i++) {
+ output.append((char) (input.charAt(i) ^ key[i % key.length]));
+ }
+
+ return output.toString();
+ }
+
+}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/SellBuyViewModel.java b/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/SellBuyViewModel.java
index 40fee06..9ac1d3e 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/SellBuyViewModel.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/SellBuyViewModel.java
@@ -35,12 +35,8 @@ public void changeBalanceAsset(String currency) {
public LiveData> getAvaliableBalance() {
LiveData> balanceData = Transformations.switchMap(
- Transformations.switchMap(currencyData, input -> {
- return statusChangeLiveData;
- }),
- statusChange -> {
- return new AvailableBalanceRepository().getTargetAvaliableBlance(currencyData.getValue());
- });
+ Transformations.switchMap(currencyData, input -> statusChangeLiveData),
+ statusChange -> new AvailableBalanceRepository().getTargetAvaliableBlance(currencyData.getValue()));
return balanceData;
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/WalletViewModel.java b/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/WalletViewModel.java
index e8cc639..8301b80 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/WalletViewModel.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/viewmodel/WalletViewModel.java
@@ -32,9 +32,7 @@ public WalletViewModel() {
retryData.setValue(retryData.getValue());
return retryData;
}),
- retryCount -> {
- return new BalanceRepository().getBalances(currencyData.getValue());
- });
+ retryCount -> new BalanceRepository().getBalances(currencyData.getValue()));
resultData.addSource(balanceData, result -> resultData.setValue(result));
});
@@ -51,6 +49,6 @@ public LiveData>> getBalanceData() {
public void retry() {
int nValue = retryData.getValue();
- retryData.setValue(nValue++);
+ retryData.setValue(++nValue);
}
}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java b/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java
index a8f202c..9450af5 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/wallet/BitsharesWalletWraper.java
@@ -1,11 +1,6 @@
package com.bitshares.bitshareswallet.wallet;
-import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceManager;
-import android.util.Pair;
-
import com.bitshares.bitshareswallet.BitsharesApplication;
-import com.bitshares.bitshareswallet.R;
import com.bitshares.bitshareswallet.market.MarketTicker;
import com.bitshares.bitshareswallet.market.MarketTrade;
import com.bitshares.bitshareswallet.wallet.common.ErrorCode;
@@ -22,19 +17,16 @@
import com.bitshares.bitshareswallet.wallet.graphene.chain.operation_history_object;
import com.bitshares.bitshareswallet.wallet.graphene.chain.operations;
import com.bitshares.bitshareswallet.wallet.graphene.chain.signed_transaction;
-import com.bitshares.bitshareswallet.wallet.graphene.chain.utils;
import com.google.common.collect.Sets;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -43,6 +35,8 @@
import de.bitsharesmunich.graphenej.FileBin;
import de.bitsharesmunich.graphenej.models.backup.LinkedAccount;
import de.bitsharesmunich.graphenej.models.backup.WalletBackup;
+import io.sentry.Sentry;
+import io.sentry.event.UserBuilder;
public class BitsharesWalletWraper {
public interface BitsharesDataObserver {
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/wallet/graphene/chain/fee_schedule.java b/app/src/main/java/com/bitshares/bitshareswallet/wallet/graphene/chain/fee_schedule.java
index 0b7da0a..a770e6d 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/wallet/graphene/chain/fee_schedule.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/wallet/graphene/chain/fee_schedule.java
@@ -1,5 +1,7 @@
package com.bitshares.bitshareswallet.wallet.graphene.chain;
+import android.util.Log;
+
import com.bitshares.bitshareswallet.wallet.asset;
import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
@@ -61,11 +63,14 @@ public asset calculate_fee(operations.operation_type operationType, price core_e
BigInteger bigScale = BigInteger.valueOf(scale);
BigInteger bigScaled = bigFee.multiply(bigScale);
BigInteger bigDefault = BigInteger.valueOf(GRAPHENE_100_PERCENT);
+
// // TODO: 07/09/2017 需要确保 FC_ASSERT( scaled <= GRAPHENE_MAX_SHARE_SUPPLY );
long lResult = bigScaled.divide(bigDefault).longValue();
- asset assetResult = new asset(lResult, new object_id(0, asset_object.class)).multipy(core_exchange_rate);
+ asset assetResult = new asset(lResult, new object_id(3275, asset_object.class)).multipy(core_exchange_rate);
+
+ Log.w("FEE", assetResult.asset_id.toString());
while (assetResult.multipy(core_exchange_rate).amount < lResult) {
assetResult.amount++;
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java b/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java
index d612ea3..b9c292b 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/wallet/wallet_api.java
@@ -73,9 +73,6 @@ class wallet_object {
List my_accounts = new ArrayList<>();
ByteBuffer cipher_keys;
HashMap, List> extra_keys = new HashMap<>();
- String ws_server = "";
- String ws_user = "";
- String ws_password = "";
public void update_account(account_object accountObject) {
boolean bUpdated = false;
@@ -88,7 +85,7 @@ public void update_account(account_object accountObject) {
}
}
- if (bUpdated == false) {
+ if (!bUpdated) {
my_accounts.add(accountObject);
}
}
@@ -213,11 +210,7 @@ private void encrypt_keys() {
byte[] ivBytes = new byte[16];
System.arraycopy(mCheckSum.hash, 32, ivBytes, 0, ivBytes.length);
- ByteBuffer byteResult = aes.encrypt(byteKey, ivBytes, encoder.getData());
-
- mWalletObject.cipher_keys = byteResult;
-
- return;
+ mWalletObject.cipher_keys = aes.encrypt(byteKey, ivBytes, encoder.getData());
}
@@ -366,7 +359,7 @@ public account_object get_account(String strAccountNameOrId) throws NetworkStatu
// 判定这类型
object_id accountObjectId = object_id.create_from_string(strAccountNameOrId);
- List listAccountObject = null;
+ List listAccountObject;
if (accountObjectId == null) {
listAccountObject = lookup_account_names(strAccountNameOrId);
} else {
@@ -571,10 +564,10 @@ public int import_account_password(String strAccountName,
return ErrorCode.ERROR_NO_ACCOUNT_OBJECT;
}
- if (accountObject.active.is_public_key_type_exist(publicActiveKeyType) == false &&
- accountObject.owner.is_public_key_type_exist(publicActiveKeyType) == false &&
- accountObject.active.is_public_key_type_exist(publicOwnerKeyType) == false &&
- accountObject.owner.is_public_key_type_exist(publicOwnerKeyType) == false){
+ if (!accountObject.active.is_public_key_type_exist(publicActiveKeyType) &&
+ !accountObject.owner.is_public_key_type_exist(publicActiveKeyType) &&
+ !accountObject.active.is_public_key_type_exist(publicOwnerKeyType) &&
+ !accountObject.owner.is_public_key_type_exist(publicOwnerKeyType)){
return ErrorCode.ERROR_PASSWORD_INVALID;
}
@@ -635,7 +628,7 @@ public signed_transaction transfer(String strFrom,
String strMemo) throws NetworkStatusException {
object_id assetObjectId = object_id.create_from_string(strAssetSymbol);
- asset_object assetObject = null;
+ asset_object assetObject;
if (assetObjectId == null) {
assetObject = lookup_asset_symbols(strAssetSymbol);
} else {
@@ -655,7 +648,7 @@ public signed_transaction transfer(String strFrom,
transferOperation.to = accountObjectTo.id;
transferOperation.amount = assetObject.amount_from_string(strAmount);
transferOperation.extensions = new HashSet<>();
- if (TextUtils.isEmpty(strMemo) == false) {
+ if (!TextUtils.isEmpty(strMemo)) {
transferOperation.memo = new memo_data();
transferOperation.memo.from = accountObjectFrom.options.memo_key;
transferOperation.memo.to = accountObjectTo.options.memo_key;
@@ -958,7 +951,7 @@ public List get_market_history(object_id assetObjec
private void set_operation_fees(signed_transaction tx, fee_schedule feeSchedule) {
for (operations.operation_type operationType : tx.operations) {
- feeSchedule.set_fee(operationType, price.unit_price(new object_id(0, asset_object.class)));
+ feeSchedule.set_fee(operationType, price.unit_price(new object_id(3275, asset_object.class)));
}
}
diff --git a/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java b/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java
index f6e1f65..da9931a 100644
--- a/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java
+++ b/app/src/main/java/com/bitshares/bitshareswallet/wallet/websocket_api.java
@@ -1,6 +1,7 @@
package com.bitshares.bitshareswallet.wallet;
import android.text.TextUtils;
+import android.util.Log;
import android.util.Pair;
import com.bitshares.bitshareswallet.market.MarketTicker;
@@ -295,7 +296,7 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
@Override
public void onMessage(WebSocket webSocket, String text) {
//super.onMessage(webSocket, text);
-
+ Log.w("WEBSOCKET", ">>> " + text);
try {
int nMethod = 0;
JSONObject jsonObject = new JSONObject(text);
@@ -977,6 +978,8 @@ private Reply sendForReplyImpl(Call callObject,
Gson gson = global_config_object.getInstance().getGsonBuilder().create();
String strMessage = gson.toJson(callObject);
+ Log.w("WEBSOCKET", "<<< " + strMessage);
+
synchronized (mHashMapIdToProcess) {
mHashMapIdToProcess.put(callObject.id, replyObjectProcess);
}
diff --git a/app/src/main/res/drawable/camera_rear.xml b/app/src/main/res/drawable/camera_rear.xml
new file mode 100644
index 0000000..f740845
--- /dev/null
+++ b/app/src/main/res/drawable/camera_rear.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/dot_filled_dark.xml b/app/src/main/res/drawable/dot_filled_dark.xml
new file mode 100644
index 0000000..902411d
--- /dev/null
+++ b/app/src/main/res/drawable/dot_filled_dark.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/flash.xml b/app/src/main/res/drawable/flash.xml
new file mode 100644
index 0000000..8463915
--- /dev/null
+++ b/app/src/main/res/drawable/flash.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/flash_off.xml b/app/src/main/res/drawable/flash_off.xml
new file mode 100644
index 0000000..856385f
--- /dev/null
+++ b/app/src/main/res/drawable/flash_off.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..62eea2a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/qrcode_scan.xml b/app/src/main/res/drawable/qrcode_scan.xml
new file mode 100644
index 0000000..8a3a7d5
--- /dev/null
+++ b/app/src/main/res/drawable/qrcode_scan.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_lock.xml b/app/src/main/res/layout/activity_lock.xml
new file mode 100644
index 0000000..ec7d731
--- /dev/null
+++ b/app/src/main/res/layout/activity_lock.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 11a7558..126e46f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -36,11 +36,6 @@
android:padding="8dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-
diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml
new file mode 100644
index 0000000..208c5fe
--- /dev/null
+++ b/app/src/main/res/layout/fragment_camera.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_pin_set.xml b/app/src/main/res/layout/fragment_pin_set.xml
new file mode 100644
index 0000000..3eaed09
--- /dev/null
+++ b/app/src/main/res/layout/fragment_pin_set.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml
new file mode 100644
index 0000000..b30cdd3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_receive.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index bbec0f0..fcd0ded 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -2,6 +2,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@android:color/white"
tools:context="com.bitshares.bitshareswallet.SendFragment">
@@ -90,6 +91,9 @@
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_toRightOf="@+id/webViewAvatarTo"
+ android:layout_toEndOf="@+id/webViewAvatarTo"
+ android:layout_toLeftOf="@id/qrScan"
+ android:layout_toStartOf="@id/qrScan"
android:inputType="text"
android:hint="@string/send_account_to_hint"
android:textSize="@dimen/send_fragment_text_size"
@@ -102,10 +106,22 @@
android:layout_marginBottom="12dp"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/editTextTo"
- android:layout_alignParentRight="true"
+ android:layout_toLeftOf="@+id/qrScan"
+ android:layout_toStartOf="@+id/qrScan"
android:textSize="@dimen/send_fragment_text_size"
android:text="#" />
+
+
-
-
-
+ android:title="@string/backup_wallet" />
- Выбор текущей пары