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

ProfileService: Check for existing interfaces when loading profiles

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-07-31 21:18:14 -05:00
parent a1e334efa6
commit 0451370caf
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/wireguard/android/ProfileService.java
View File

@ -50,25 +50,35 @@ public class ProfileService extends Service {
private class ProfileLoader extends AsyncTask<File, Void, List<Profile>> { private class ProfileLoader extends AsyncTask<File, Void, List<Profile>> {
@Override @Override
protected List<Profile> doInBackground(File... files) { protected List<Profile> doInBackground(File... files) {
final List<String> interfaceNames = new LinkedList<>();
final List<Profile> loadedProfiles = new LinkedList<>(); final List<Profile> loadedProfiles = new LinkedList<>();
final String command = "ip -br link show type wireguard | cut -d' ' -f1";
if (RootShell.run(interfaceNames, command) != 0) {
interfaceNames.clear();
Log.w(TAG, "Can't enumerate network interfaces. All profiles will appear down.");
}
for (File file : files) { for (File file : files) {
if (isCancelled())
return null;
final String fileName = file.getName(); final String fileName = file.getName();
final String profileName = fileName.substring(0, fileName.length() - 5); final String profileName = fileName.substring(0, fileName.length() - 5);
final Profile profile = new Profile(profileName); final Profile profile = new Profile(profileName);
Log.v(TAG, "Attempting to load profile " + profileName);
try { try {
profile.parseFrom(openFileInput(fileName)); profile.parseFrom(openFileInput(fileName));
profile.setIsConnected(interfaceNames.contains(profileName));
loadedProfiles.add(profile); loadedProfiles.add(profile);
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to load profile from " + fileName, e); Log.w(TAG, "Failed to load profile from " + fileName, e);
} }
if (isCancelled())
break;
} }
return loadedProfiles; return loadedProfiles;
} }
@Override @Override
protected void onPostExecute(List<Profile> loadedProfiles) { protected void onPostExecute(List<Profile> loadedProfiles) {
if (loadedProfiles == null)
return;
profiles.addAll(loadedProfiles); profiles.addAll(loadedProfiles);
} }
} }