Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KeyInputFilter: Extract to its own class

Browse Source 
It will be reused for entering public keys of peers.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-08-15 17:33:00 -05:00
parent 2103a28f8f
commit 7f864badb2
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/wireguard/android/ConfigEditFragment.java
View File

@ -4,8 +4,6 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.InputFilter; import android.text.InputFilter;
import android.text.LoginFilter; import android.text.LoginFilter;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -17,7 +15,6 @@ import android.widget.EditText;
import com.wireguard.android.databinding.ConfigEditFragmentBinding; import com.wireguard.android.databinding.ConfigEditFragmentBinding;
import com.wireguard.config.Config; import com.wireguard.config.Config;
import com.wireguard.crypto.KeyEncoding;
/** /**
* Fragment for editing a WireGuard configuration. * Fragment for editing a WireGuard configuration.
@ -58,39 +55,7 @@ public class ConfigEditFragment extends BaseConfigFragment {
} }
}); });
final EditText privateKeyText = binding.getRoot().findViewById(R.id.private_key_text); final EditText privateKeyText = binding.getRoot().findViewById(R.id.private_key_text);
privateKeyText.setFilters(new InputFilter[]{ privateKeyText.setFilters(new InputFilter[]{new KeyInputFilter()});
new InputFilter() {
@Override
public CharSequence filter(final CharSequence source,
final int sStart, final int sEnd,
final Spanned dest,
final int dStart, final int dEnd) {
SpannableStringBuilder replacement = null;
int rIndex = 0;
final int dLength = dest.length();
for (int sIndex = sStart; sIndex < sEnd; ++sIndex) {
final char c = source.charAt(sIndex);
final int dIndex = dStart + (sIndex - sStart);
// Restrict characters to the base64 character set.
// Ensure adding this character does not push the length over the limit.
if (((dIndex + 1 < KeyEncoding.KEY_LENGTH_BASE64 && isAllowed(c)) ||
(dIndex + 1 == KeyEncoding.KEY_LENGTH_BASE64 && c == '=')) &&
dLength + (sIndex - sStart) < KeyEncoding.KEY_LENGTH_BASE64) {
++rIndex;
} else {
if (replacement == null)
replacement = new SpannableStringBuilder(source, sStart, sEnd);
replacement.delete(rIndex, rIndex + 1);
}
}
return replacement;
}
private boolean isAllowed(final char c) {
return Character.isLetterOrDigit(c) || c == '+' || c == '/';
}
}
});
binding.setConfig(localConfig); binding.setConfig(localConfig);
return binding.getRoot(); return binding.getRoot();
} }

42
app/src/main/java/com/wireguard/android/KeyInputFilter.java Normal file
View File

@ -0,0 +1,42 @@
package com.wireguard.android;
import android.text.InputFilter;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import com.wireguard.crypto.KeyEncoding;
/**
* InputFilter for entering WireGuard private/public keys encoded with base64.
*/
class KeyInputFilter implements InputFilter {
@Override
public CharSequence filter(final CharSequence source,
final int sStart, final int sEnd,
final Spanned dest,
final int dStart, final int dEnd) {
SpannableStringBuilder replacement = null;
int rIndex = 0;
final int dLength = dest.length();
for (int sIndex = sStart; sIndex < sEnd; ++sIndex) {
final char c = source.charAt(sIndex);
final int dIndex = dStart + (sIndex - sStart);
// Restrict characters to the base64 character set.
// Ensure adding this character does not push the length over the limit.
if (((dIndex + 1 < KeyEncoding.KEY_LENGTH_BASE64 && isAllowed(c)) ||
(dIndex + 1 == KeyEncoding.KEY_LENGTH_BASE64 && c == '=')) &&
dLength + (sIndex - sStart) < KeyEncoding.KEY_LENGTH_BASE64) {
++rIndex;
} else {
if (replacement == null)
replacement = new SpannableStringBuilder(source, sStart, sEnd);
replacement.delete(rIndex, rIndex + 1);
}
}
return replacement;
}
private boolean isAllowed(final char c) {
return Character.isLetterOrDigit(c) || c == '+' || c == '/';
}
}