mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 23:41:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate
2018-03-25 01:10:06 +01:00
parent fbb830d4a8 cbf3c983e1
commit 100fed5708
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -356,13 +356,30 @@ public class OpenScale {
updateScaleData();
}
public String getFilenameFromUri(Uri uri) {
public String getFilenameFromUriMayThrow(Uri uri) {
Cursor cursor = context.getContentResolver().query(
uri, null, null, null, null);
cursor.moveToFirst();
return cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
}
public String getFilenameFromUri(Uri uri) {
try {
return getFilenameFromUriMayThrow(uri);
}
catch (Exception e) {
String name = uri.getLastPathSegment();
if (name != null) {
return name;
}
name = uri.getPath();
if (name != null) {
return name;
}
return uri.toString();
}
}
public void importData(Uri uri) {
try {
final String filename = getFilenameFromUri(uri);

2
android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java
View File

@@ -590,7 +590,7 @@ public class MainActivity extends BaseAppCompatActivity
// Verify that the file still exists and that we have write permission
getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
openScale.getFilenameFromUri(uri);
openScale.getFilenameFromUriMayThrow(uri);
}
catch (Exception ex) {
uri = null;