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

fix when reporting error from native platform

Browse source
This commit is contained in:
Thibault Deckers 2020-06-11 14:59:48 +09:00
parent a6eeba7744
commit a6c7f48799
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/deckers/thibault/aves/channelhandlers/ImageFileHandler.java
View file

@ -112,7 +112,7 @@ public class ImageFileHandler implements MethodChannel.MethodCallHandler {
@Override @Override
public void onFailure(Throwable throwable) { public void onFailure(Throwable throwable) {
result.error("getImageEntry-failure", "failed to get entry for uri=" + uriString, throwable); result.error("getImageEntry-failure", "failed to get entry for uri=" + uriString, throwable.getMessage());
} }
}); });
} }
@ -141,7 +141,7 @@ public class ImageFileHandler implements MethodChannel.MethodCallHandler {
@Override @Override
public void onFailure(Throwable throwable) { public void onFailure(Throwable throwable) {
new Handler(Looper.getMainLooper()).post(() -> result.error("rename-failure", "failed to rename", throwable)); new Handler(Looper.getMainLooper()).post(() -> result.error("rename-failure", "failed to rename", throwable.getMessage()));
} }
}); });
} }
@ -170,7 +170,7 @@ public class ImageFileHandler implements MethodChannel.MethodCallHandler {
@Override @Override
public void onFailure(Throwable throwable) { public void onFailure(Throwable throwable) {
new Handler(Looper.getMainLooper()).post(() -> result.error("rotate-failure", "failed to rotate", throwable)); new Handler(Looper.getMainLooper()).post(() -> result.error("rotate-failure", "failed to rotate", throwable.getMessage()));
} }
}); });
} }

17
lib/main.dart
View file

@ -123,10 +123,14 @@ class _HomePageState extends State<HomePage> {
switch (action) { switch (action) {
case 'view': case 'view':
AvesApp.mode = AppMode.view; AvesApp.mode = AppMode.view;
await _initViewerEntry( _viewerEntry = await _initViewerEntry(
uri: intentData['uri'], uri: intentData['uri'],
mimeType: intentData['mimeType'], mimeType: intentData['mimeType'],
); );
if (_viewerEntry == null) {
// fallback to default mode when we fail to retrieve the entry
AvesApp.mode = AppMode.main;
}
break; break;
case 'pick': case 'pick':
AvesApp.mode = AppMode.pick; AvesApp.mode = AppMode.pick;
@ -140,11 +144,14 @@ class _HomePageState extends State<HomePage> {
} }
} }
Future<void> _initViewerEntry({@required String uri, @required String mimeType}) async { Future<ImageEntry> _initViewerEntry({@required String uri, @required String mimeType}) async {
_viewerEntry = await ImageFileService.getImageEntry(uri, mimeType); final entry = await ImageFileService.getImageEntry(uri, mimeType);
if (entry != null) {
// cataloguing is essential for geolocation and video rotation // cataloguing is essential for geolocation and video rotation
await _viewerEntry.catalog(); await entry.catalog();
unawaited(_viewerEntry.locate()); unawaited(entry.locate());
}
return entry;
} }
@override @override