rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-09-19 19:06:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify code and fix bugs

Browse Source
This commit is contained in:
pokkst 2022-09-08 23:38:42 -05:00
parent 66b92bb0b1
commit d66e8976a5
No known key found for this signature in database
GPG Key ID: 90C2ED85E67A50FF
6 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/m2049r/xmrwallet/MainActivity.java
View File

@ -90,7 +90,7 @@ public class MainActivity extends AppCompatActivity implements MoneroHandlerThre
@Override
public void onConnectionFail() {
System.out.println("CONNECT FAILED");
Toast.makeText(this, R.string.connection_failed, Toast.LENGTH_SHORT).show();
}
@Override

10
app/src/main/java/com/m2049r/xmrwallet/fragment/settings/SettingsFragment.java
View File

@ -45,6 +45,7 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia
Button displaySeedButton = view.findViewById(R.id.display_seed_button);
TextView walletInfoTextView = view.findViewById(R.id.wallet_info_textview);
SwitchCompat nightModeSwitch = view.findViewById(R.id.day_night_switch);
SwitchCompat torSwitch = view.findViewById(R.id.tor_switch);
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("Private view-key: " + wallet.getSecretViewKey()+"\n\n");
@ -62,6 +63,15 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia
}
});
torSwitch.setChecked(PrefService.getInstance().getBoolean(Constants.PREF_USES_TOR, false));
torSwitch.setOnCheckedChangeListener((compoundButton, b) -> {
PrefService.getInstance().edit().putBoolean(Constants.PREF_USES_TOR, b).apply();
String proxy = b ? "127.0.0.1:9050" : "";
WalletManager.getInstance().setProxy(proxy);
WalletManager.getInstance().getWallet().setProxy(proxy);
});
displaySeedButton.setOnClickListener(view1 -> {
boolean usesPassword = PrefService.getInstance().getBoolean(Constants.PREF_USES_PASSWORD, false);
if(usesPassword) {

13
app/src/main/java/com/m2049r/xmrwallet/service/MoneroHandlerThread.java
View File

@ -26,6 +26,7 @@ import com.m2049r.xmrwallet.model.PendingTransaction;
import com.m2049r.xmrwallet.model.Wallet;
import com.m2049r.xmrwallet.model.WalletListener;
import com.m2049r.xmrwallet.model.WalletManager;
import com.m2049r.xmrwallet.util.Constants;
import java.io.File;
@ -55,9 +56,15 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
@Override
public void run() {
WalletManager.getInstance().setProxy("127.0.0.1:9050");
WalletManager.getInstance().setDaemon(Node.fromString(DefaultNodes.MONERUJO_ONION.getUri()));
wallet.setProxy("127.0.0.1:9050");
boolean usesTor = PrefService.getInstance().getBoolean(Constants.PREF_USES_TOR, false);
if(usesTor) {
String proxy = "127.0.0.1:9050";
WalletManager.getInstance().setProxy(proxy);
WalletManager.getInstance().setDaemon(Node.fromString(DefaultNodes.MONERUJO_ONION.getUri()));
wallet.setProxy(proxy);
} else {
WalletManager.getInstance().setDaemon(Node.fromString(DefaultNodes.XMRTW.getUri()));
}
wallet.init(0);
wallet.setListener(this);
wallet.startRefresh();

1
app/src/main/java/com/m2049r/xmrwallet/util/Constants.java
View File

@ -4,4 +4,5 @@ public class Constants {
public static final String WALLET_NAME = "xmr_wallet";
public static final String MNEMONIC_LANGUAGE = "English";
public static final String PREF_USES_PASSWORD = "pref_uses_password";
public static final String PREF_USES_TOR = "pref_uses_tor";
}

37
app/src/main/res/layout/fragment_settings.xml
View File

@ -20,14 +20,14 @@
android:id="@+id/display_seed_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Display recovery phrase"
android:text="@string/display_recovery_phrase"
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/night_mode_label"
android:id="@+id/day_night_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/night_mode"
@ -36,14 +36,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/day_night_switch"/>
<TextView
android:id="@+id/wallet_info_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/day_night_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/day_night_switch"
android:layout_width="wrap_content"
@ -51,4 +43,29 @@
app:layout_constraintTop_toBottomOf="@id/display_seed_button"
app:layout_constraintEnd_toEndOf="parent"/>
<TextView
android:id="@+id/tor_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/tor_switch_label"
app:layout_constraintTop_toTopOf="@id/tor_switch"
app:layout_constraintBottom_toBottomOf="@id/tor_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/tor_switch"/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/tor_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:layout_constraintTop_toBottomOf="@id/day_night_switch"
app:layout_constraintEnd_toEndOf="parent"/>
<TextView
android:id="@+id/wallet_info_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tor_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/values/strings.xml
View File

@ -546,4 +546,7 @@
<string name="invalid_mnemonic_code">Invalid mnemonic</string>
<string name="copied_to_clipboard">Copied to clipboard</string>
<string name="night_mode">Night mode</string>
<string name="display_recovery_phrase">Display recovery phrase</string>
<string name="tor_switch_label">Enable Tor (requires Orbot or similar app)</string>
<string name="connection_failed">Connection failed</string>
</resources>