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

ConfigImporter: Get filename from content resolver

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-11-25 23:38:16 -06:00
parent 283340f5dc
commit 14a7ada6e1
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/wireguard/android/backends/VpnService.java
View File

@ -5,12 +5,14 @@ import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.provider.OpenableColumns;
import android.service.quicksettings.TileService; import android.service.quicksettings.TileService;
import android.util.Log; import android.util.Log;
@ -285,11 +287,32 @@ public class VpnService extends Service
for (final Uri uri : uris) { for (final Uri uri : uris) {
if (isCancelled()) if (isCancelled())
return null; return null;
String name = Uri.decode(uri.getLastPathSegment()); String name = null;
if (name.indexOf('/') >= 0) if ("file".equals(uri.getScheme())) {
name = name.substring(name.lastIndexOf('/')); name = uri.getLastPathSegment();
} else {
final String[] columns = {OpenableColumns.DISPLAY_NAME};
try (final Cursor cursor =
getContentResolver().query(uri, columns, null, null, null)) {
if (cursor != null && cursor.moveToFirst() && !cursor.isNull(0)) {
name = cursor.getString(0);
Log.v(getClass().getSimpleName(), "Got name via cursor");
}
}
if (name == null) {
name = Uri.decode(uri.getLastPathSegment());
if (name.indexOf('/') >= 0)
name = name.substring(name.lastIndexOf('/') + 1);
Log.v(getClass().getSimpleName(), "Got name from urlencoded path");
}
}
if (!name.endsWith(".conf")) if (!name.endsWith(".conf"))
name = name + ".conf"; name = name + ".conf";
if (!Config.isNameValid(name.substring(0, name.length() - 5))) {
Log.v(getClass().getSimpleName(), "Detected name is not valid: " + name);
name = "ImportedConfig.conf";
}
Log.d(getClass().getSimpleName(), "Mapped URI " + uri + " to file name " + name);
final File output = new File(getFilesDir(), name); final File output = new File(getFilesDir(), name);
if (output.exists()) { if (output.exists()) {
Log.w(getClass().getSimpleName(), "Config file for " + uri + " already exists"); Log.w(getClass().getSimpleName(), "Config file for " + uri + " already exists");