Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Another Android Monero Wallet for Monero

### QUICKSTART
- Download the APK for the most current release [here](https://github.com/m2049r/xmrwallet/releases) and install it
- Alternatively add our F-Droid repo https://f-droid.monerujo.io/fdroid/repo with fingerpint ```A8 2C 68 E1 4A F0 AA 6A 2E C2 0E 6B 27 2E FF 25 E5 A0 38 F3 F6 58 84 31 6E 0F 5E 0D 91 E7 B7 13``` to your F-Droid client
- Alternatively add our F-Droid repo https://f-droid.monerujo.io/fdroid/repo with fingerprint ```A8 2C 68 E1 4A F0 AA 6A 2E C2 0E 6B 27 2E FF 25 E5 A0 38 F3 F6 58 84 31 6E 0F 5E 0D 91 E7 B7 13``` to your F-Droid client
- Run the App and select "Generate Wallet" to create a new wallet or recover a wallet
- Advanced users can copy over synced wallet files (all files) onto sdcard in directory Monerujo (created first time App is started)
- See the [FAQ](doc/FAQ.md)
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/assets/licenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ <h3>Original SSLeay License</h3>
The implementation was written so as to conform with Netscapes SSL.<br/>
<br/>
This library is free for commercial and non-commercial use as long as
the following conditions are aheared to. The following conditions
the following conditions are adhered to. The following conditions
apply to all code found in this distribution, be it the RC4, RSA,
lhash, DES, etc., code; not just the SSL code. The SSL documentation
included with this distribution is covered by the same copyright terms
Expand All @@ -579,7 +579,7 @@ <h3>Original SSLeay License</h3>
must display the following acknowledgement:<br/>
"This product includes cryptographic software written by
Eric Young (eay@cryptsoft.com)"
The word &apos;cryptographic&apos; can be left out if the rouines from the library
The word &apos;cryptographic&apos; can be left out if the routines from the library
being used are not cryptographic related :-).<br/>
4. If you include any Windows specific code (or a derivative thereof) from
the apps directory (application code) you must include an acknowledgement:
Expand All @@ -597,7 +597,7 @@ <h3>Original SSLeay License</h3>
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.<br/>
<br/>
The licence and distribution terms for any publically available version or
The licence and distribution terms for any publicly available version or
derivative of this code cannot be changed. i.e. this code cannot simply be
copied and put under another distribution licence
[including the GNU Public Licence.]
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/cpp/monerujo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ struct MyWalletListener : Monero::WalletListener {
}

/**
* @brief updated - generic callback, called when any event (sent/received/block reveived/etc) happened with the wallet;
* @brief updated - generic callback, called when any event (sent/received/block received/etc) happened with the wallet;
*/
void updated() {
std::lock_guard<std::mutex> lock(_listenerMutex);
Expand Down Expand Up @@ -1285,7 +1285,7 @@ Java_com_m2049r_xmrwallet_model_Wallet_getLastSubaddress(JNIEnv *env, jobject in
}
*/
//virtual std::string signMessage(const std::string &message) = 0;
//virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0;
//virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const = 0;

//virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &tvAmount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) = 0;
//virtual bool rescanSpent() = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {

@Override
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
String type = getArguments().getString(REQUEST_TYPE); // intance variable <type> not set yet
String type = getArguments().getString(REQUEST_TYPE); // instance variable <type> not set yet
if (GenerateReviewFragment.VIEW_TYPE_ACCEPT.equals(type)) {
inflater.inflate(R.menu.wallet_details_help_menu, menu);
super.onCreateOptionsMenu(menu, inflater);
Expand Down Expand Up @@ -659,7 +659,7 @@ private boolean isKeyValid(String key) {
return (key != null) && (key.length() == 64)
&& !key.equals("0000000000000000000000000000000000000000000000000000000000000000")
&& !key.toLowerCase().equals("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
// ledger implmenetation returns the spend key as f's
// ledger implementation returns the spend key as f's
}

private class AsyncShowSeed extends AsyncTask<String, Void, Boolean> {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ void startDetails(File walletFile, String password, String type) {
}

void startLoginFragment() {
// we set these here because we cannot be ceratin we have permissions for storage before
// we set these here because we cannot be certain we have permissions for storage before
Helper.setMoneroHome(this);
Helper.initLogger(this);
Fragment fragment = new LoginFragment();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public void onOrderParametersReceived(QueryOrderParameters orderParameters) {
@Override
public boolean isActive() {
return true;
} // TODO Test what happens if we swtich away while querying
} // TODO Test what happens if we switch away while querying

@Override
public void showProgress() {
Expand All @@ -293,4 +293,4 @@ public void onExchangeRequested() {
}
}, EXCHANGE_TIME);
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ public void setListener(WalletListener listener) {
public native String getTxKey(String txid);

//virtual std::string signMessage(const std::string &message) = 0;
//virtual bool verifySignedMessage(const std::string &message, const std::string &addres, const std::string &signature) const = 0;
//virtual bool verifySignedMessage(const std::string &message, const std::string &address, const std::string &signature) const = 0;

//virtual bool parse_uri(const std::string &uri, std::string &address, std::string &payment_id, uint64_t &tvAmount, std::string &tx_description, std::string &recipient_name, std::vector<std::string> &unknown_parameters, std::string &error) = 0;
//virtual bool rescanSpent() = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public interface WalletListener {
void newBlock(long height);

/**
* updated - generic callback, called when any event (sent/received/block reveived/etc) happened with the wallet;
* updated - generic callback, called when any event (sent/received/block received/etc) happened with the wallet;
*/
void updated();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ private Wallet.Status start(String walletName, String walletPassword) {
showProgress(getString(R.string.status_wallet_connecting));
showProgress(101);
// if we try to refresh the history here we get occasional segfaults!
// doesnt matter since we update as soon as we get a new block anyway
// doesn't matter since we update as soon as we get a new block anyway
Timber.d("start() done");
return getWallet().getFullStatus();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
public interface ExchangeApi {

/**
* Queries the exchnage rate
* Queries the exchange rate
*
* @param baseCurrency base currency
* @param quoteCurrency quote currency
Expand All @@ -35,4 +35,3 @@ void queryExchangeRate(@NonNull final String baseCurrency, @NonNull final String

String getName();
}

4 changes: 2 additions & 2 deletions app/src/main/java/com/m2049r/xmrwallet/widget/Toolbar.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected void onFinishInflate() {
super.onFinishInflate();
toolbarImage = findViewById(R.id.toolbarImage);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
// the vector image does not work well for androis < Nougat
// the vector image does not work well for Android < Nougat
toolbarImage.getLayoutParams().width = (int) getResources().getDimension(R.dimen.logo_width);
toolbarImage.setImageResource(R.drawable.logo_horizontol_xmrujo);
}
Expand Down Expand Up @@ -160,4 +160,4 @@ public void setSubtitle(String subtitle) {
toolbarSubtitle.setVisibility(View.INVISIBLE);
}
}
}
}