Skip to content

fix: (AdvancedFragment.java) save pre-shared key correctly #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 13, 2025
Merged

fix: (AdvancedFragment.java) save pre-shared key correctly #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c83f03
fix: (AdvancedFragment.java) save pre-shared key correctly
nev-al Sep 7, 2025
9596184
Merge branch 'netbirdio:main' into main
nev-al Sep 13, 2025
4ea9c1d
Add preshared key save feedback
nev-al Sep 13, 2025
6548cd9
Save preshared key correctly
nev-al Sep 13, 2025
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
11 changes: 9 additions & 2 deletions app/src/main/java/io/netbird/client/ui/advanced/AdvancedFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,14 @@ private boolean isValidPresharedKey(String key) {
private void setPreSharedKey(String key, Context context) {
String configFilePath = Preferences.configFile(context);
io.netbird.gomobile.android.Preferences preferences = new io.netbird.gomobile.android.Preferences(configFilePath);
preferences.setPreSharedKey(key);
try {
preferences.setPreSharedKey(key);
preferences.commit();
Toast.makeText(context, R.string.advanced_presharedkey_saved_success, Toast.LENGTH_SHORT).show();
} catch (Exception e) {
Log.e(LOGTAG, "Failed to save pre-shared key", e);
Copy link
Collaborator

@pappz pappz Sep 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move the string to strings.xml value file

Toast.makeText(context, R.string.advanced_presharedkey_save_error + ": " + e.getMessage(), Toast.LENGTH_LONG).show();
}
}

private boolean hasPreSharedKey(Context context) {
Expand All @@ -301,4 +308,4 @@ private void shareLog() {
Log.e(LOGTAG, "failed to dump log", e);
}
}
}
}
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
<string name="advanced_details">You will only communicate with peers that use the same key.</string>
<string name="advanced_hint">Add a pre-shared key</string>
<string name="advanced_save">Save</string>
<string name="advanced_presharedkey_saved_success">Pre-shared key saved successfully</string>
<string name="advanced_presharedkey_save_error">Failed to save pre-shared key</string>
<string name="advanced_tracelog">Enable trace log level.</string>
<string name="advanced_share_logs">Share logs</string>
<string name="advanced_rosenpass">Enable Rosenpass</string>
Expand Down
Loading