Skip to content
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

Jump to bottom

show country code #219

Merged
merged 3 commits into from
Apr 5, 2018
Merged

show country code #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f522de6
Merge pull request #3 from guardianproject/master
percy-g2 Jan 6, 2018
1baf43d
Merge pull request #4 from guardianproject/master
percy-g2 Jan 12, 2018
55e6952
show country code as per default locale country for notification and …
percy-g2 Jan 14, 2018
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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ dependencies {
compile 'com.maxproj.simplewaveform:app:1.0.0'
compile 'com.takisoft.fix:preference-v7:27.0.2.0'
compile 'com.wdullaer:materialdatetimepicker:3.5.0'

compile 'com.googlecode.libphonenumber:libphonenumber:8.7.0'
implementation('com.mikepenz:aboutlibraries:6.0.1@aar') {
transitive = true
}
Expand Down
28 changes: 24 additions & 4 deletions src/main/java/org/havenapp/main/SettingsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import android.view.MenuItem;
import android.widget.Toast;

import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat;
import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;

Expand All @@ -31,6 +32,7 @@
import org.havenapp.main.ui.MicrophoneConfigureActivity;

import java.io.File;
import java.util.Locale;

import info.guardianproject.netcipher.proxy.OrbotHelper;

Expand Down Expand Up @@ -76,6 +78,19 @@ public void onCreatePreferencesFix(Bundle bundle, String s) {
((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).setChecked(true);
}

findPreference(PreferenceManager.SMS_NUMBER).setOnPreferenceClickListener(preference -> {
if (preferences.getSmsNumber().isEmpty()) {
((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).setText(getCountryCode());
}
return false;
});
findPreference(PreferenceManager.REGISTER_SIGNAL).setOnPreferenceClickListener(preference -> {
if (preferences.getSignalUsername() == null) {
((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).setText(getCountryCode());
}
return false;
});

if (checkValidString(preferences.getSmsNumber())) {
((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).setText(preferences.getSmsNumber().trim());
findPreference(PreferenceManager.SMS_NUMBER).setSummary(preferences.getSmsNumber().trim());
Expand Down Expand Up @@ -254,15 +269,15 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
case PreferenceManager.REGISTER_SIGNAL:
String signalNum = ((EditTextPreference) findPreference(PreferenceManager.REGISTER_SIGNAL)).getText();

if (checkValidString(signalNum)) {
if (checkValidString(signalNum) && !getCountryCode().equalsIgnoreCase(signalNum)) {
signalNum = "+" + signalNum.trim().replaceAll("[^0-9]", "");

preferences.setSignalUsername(signalNum);
findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(signalNum);

resetSignal(preferences.getSignalUsername());
activateSignal(preferences.getSignalUsername(), null);
} else {
} else if (!getCountryCode().equalsIgnoreCase(signalNum)) {
preferences.setSignalUsername("");
findPreference(PreferenceManager.REGISTER_SIGNAL).setSummary(R.string.register_signal_desc);
}
Expand Down Expand Up @@ -305,6 +320,11 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
}
}

String getCountryCode() {
PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
return "+" + String.valueOf(phoneUtil.getCountryCodeForRegion(Locale.getDefault().getCountry()));
}

private void setPhoneNumber() {
boolean smsActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.SMS_ACTIVE)).isChecked();
String phoneNumber = ((EditTextPreference) findPreference(PreferenceManager.SMS_NUMBER)).getText();
Expand All @@ -314,10 +334,10 @@ private void setPhoneNumber() {
preferences.activateSms(false);
}

if (checkValidString(phoneNumber)) {
if (checkValidString(phoneNumber) && !getCountryCode().equalsIgnoreCase(phoneNumber)) {
preferences.setSmsNumber(phoneNumber.trim());
findPreference(PreferenceManager.SMS_NUMBER).setSummary(phoneNumber.trim());
} else {
} else if (!getCountryCode().equalsIgnoreCase(phoneNumber)){
preferences.setSmsNumber("");
findPreference(PreferenceManager.SMS_NUMBER).setSummary(R.string.sms_dialog_message);
}
Expand Down