Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #705 from afischerdev/new-apk

Browse source 
Prevent exceptions when importing profiles
This commit is contained in:
afischerdev 2024-06-03 17:31:22 +02:00 committed by GitHub
commit e011343ab0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brouter-routing-app/src/main/java/btools/routingapp/BImportActivity.java
View file

@ -73,13 +73,19 @@ public class BImportActivity extends AppCompatActivity {
// URI example ==> dat=content://me.bluemail.mail.attachmentprovider/a2939069-76b5-44e4-8cbd-94485d0fd4ff/cc32b61d-97a6-4871-b67f-945d1d1d43c8/VIEW // URI example ==> dat=content://me.bluemail.mail.attachmentprovider/a2939069-76b5-44e4-8cbd-94485d0fd4ff/cc32b61d-97a6-4871-b67f-945d1d1d43c8/VIEW
String filename = null; String filename = null;
long filesize = 0L; long filesize = 0L;
try (Cursor cursor = this.getContentResolver().query(intent.getData(), new String[]{ try (Cursor cursor = this.getContentResolver().query(intent.getData(), new String[]{
OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE}, null, null, null)) { OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE}, null, null, null)) {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)); filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
filesize = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE)); filesize = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE));
} }
} catch (Exception e) {
resultMessage.append("ERROR: File not accessible\n");
displayMessage(resultMessage.toString());
return;
} }
// is the file extention ".brf" in the file name // is the file extention ".brf" in the file name
if (filename == null || isInvalidProfileFilename(filename)) { if (filename == null || isInvalidProfileFilename(filename)) {
resultMessage.append("ERROR: File extention must be \".brf\"\n"); resultMessage.append("ERROR: File extention must be \".brf\"\n");

3
docs/revisions.md
View file

@ -17,6 +17,9 @@ Profiles
- update gravel profile - update gravel profile
- Minor bug fixes
[Solved issues](https://github.com/abrensch/brouter/issues?q=is%3Aissue+milestone%3A%22Version+1.7.5%22+is%3Aclosed) [Solved issues](https://github.com/abrensch/brouter/issues?q=is%3Aissue+milestone%3A%22Version+1.7.5%22+is%3Aclosed)