Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Silence-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
268
Issues
268
List
Boards
Labels
Service Desk
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Silence
Silence-Android
Commits
d4b0e5c4
Commit
d4b0e5c4
authored
Mar 02, 2016
by
Bastien Le Querrec
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[WIP] fix summary update
parent
b1d81e85
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
res/xml/preferences_web.xml
res/xml/preferences_web.xml
+2
-1
src/org/smssecure/smssecure/preferences/WebPreferenceFragment.java
...mssecure/smssecure/preferences/WebPreferenceFragment.java
+7
-10
src/org/smssecure/smssecure/util/SMSSecurePreferences.java
src/org/smssecure/smssecure/util/SMSSecurePreferences.java
+1
-1
No files found.
res/xml/preferences_web.xml
View file @
d4b0e5c4
...
...
@@ -8,7 +8,8 @@
android:title=
"@string/preferences__enable_web_interface"
android:summary=
"@string/preferences__enable_this_option_to_send_and_receive_messages_from_your_desktop"
/>
<EditTextPreference
android:key=
"preference_web_interface_passphrase"
<EditTextPreference
android:id=
"@+id/preference_web_interface_passphrase"
android:key=
"pref_web_interface_passphrase"
android:title=
"@string/preferences_web_interface_passphrase"
android:inputType=
"text"
android:dependency=
"pref_enable_web_interface"
/>
...
...
src/org/smssecure/smssecure/preferences/WebPreferenceFragment.java
View file @
d4b0e5c4
...
...
@@ -22,7 +22,8 @@ public class WebPreferenceFragment extends PreferenceFragment {
super
.
onCreate
(
paramBundle
);
addPreferencesFromResource
(
R
.
xml
.
preferences_web
);
updatePassphraseDisplay
();
findPreference
(
SMSSecurePreferences
.
WEB_INTERFACE_PASSPHRASE
)
.
setSummary
(
SMSSecurePreferences
.
getWebInterfacePassphrase
(
getActivity
()));
findPreference
(
SMSSecurePreferences
.
WEB_INTERFACE_ENABLED
)
.
setOnPreferenceClickListener
(
new
InitializePassphrase
());
...
...
@@ -55,14 +56,15 @@ public class WebPreferenceFragment extends PreferenceFragment {
SecureRandom
random
=
SecureRandom
.
getInstance
(
"SHA1PRNG"
);
byte
[]
salt
=
new
byte
[
16
];
random
.
nextBytes
(
salt
);
SMSSecurePreferences
.
setWebInterfacePassphrase
(
context
,
Base64
.
encodeBytes
(
salt
));
String
passphrase
=
Base64
.
encodeBytes
(
salt
);
SMSSecurePreferences
.
setWebInterfacePassphrase
(
context
,
passphrase
);
findPreference
(
SMSSecurePreferences
.
WEB_INTERFACE_PASSPHRASE
).
setSummary
(
passphrase
);
}
catch
(
Exception
e
)
{
Log
.
w
(
TAG
,
e
);
throw
new
AssertionError
(
e
);
}
updatePassphraseDisplay
();
return
true
;
}
}
...
...
@@ -74,15 +76,10 @@ public class WebPreferenceFragment extends PreferenceFragment {
if
(
newValue
.
toString
().
equals
(
""
))
{
return
false
;
}
else
{
updatePassphraseDisplay
(
);
preference
.
setSummary
(
newValue
.
toString
()
);
return
true
;
}
}
}
private
void
updatePassphraseDisplay
()
{
findPreference
(
SMSSecurePreferences
.
WEB_INTERFACE_PASSPHRASE
)
.
setSummary
(
SMSSecurePreferences
.
getWebInterfacePassphrase
(
getActivity
()));
}
}
src/org/smssecure/smssecure/util/SMSSecurePreferences.java
View file @
d4b0e5c4
...
...
@@ -93,7 +93,7 @@ public class SMSSecurePreferences {
private
static
final
String
MEDIA_DOWNLOAD_ROAMING_PREF
=
"pref_media_download_roaming"
;
public
static
final
String
WEB_INTERFACE_ENABLED
=
"pref_enable_web_interface"
;
public
static
final
String
WEB_INTERFACE_PASSPHRASE
=
"pref
erence
_web_interface_passphrase"
;
public
static
final
String
WEB_INTERFACE_PASSPHRASE
=
"pref_web_interface_passphrase"
;
public
static
NotificationPrivacyPreference
getNotificationPrivacy
(
Context
context
)
{
return
new
NotificationPrivacyPreference
(
getStringPreference
(
context
,
NOTIFICATION_PRIVACY_PREF
,
"all"
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment