diff --git a/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabaseDescriptor.h b/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabaseDescriptor.h index e6509a682..3132fdce0 100644 --- a/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabaseDescriptor.h +++ b/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabaseDescriptor.h @@ -5,6 +5,8 @@ * LICENSE file in the root directory of this source tree. */ +#import + @protocol DatabaseDescriptor - (NSString*)name; @end diff --git a/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m b/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m index 428ab34f4..40b2908f2 100644 --- a/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m +++ b/iOS/Plugins/FlipperKitDatabasesPlugin/FlipperKitDatabasesPlugin/DatabasesManager.m @@ -115,10 +115,11 @@ databaseGetTableDataResponseToDictionary:tableDataResponse]; [responder success:response]; } @catch (NSException* exception) { + NSString* reason = exception.reason ?: @"Unknown error"; NSDictionary* errorResponse = [ObjectMapper errorWithCode:DatabasesErrorCodesSqlExecutionException message:[kDatabasesErrorCodesSqlExecutionExceptionMessage - stringByAppendingString:exception.reason]]; + stringByAppendingString:reason]]; [responder error:errorResponse]; } }]; @@ -151,10 +152,11 @@ databaseGetTableStructureResponseToDictionary:tableStructure]; [responder success:response]; } @catch (NSException* exception) { + NSString* reason = exception.reason ?: @"Unknown error"; NSDictionary* errorResponse = [ObjectMapper errorWithCode:DatabasesErrorCodesSqlExecutionException message:[kDatabasesErrorCodesSqlExecutionExceptionMessage - stringByAppendingString:exception.reason]]; + stringByAppendingString:reason]]; [responder error:errorResponse]; } }]; @@ -185,10 +187,11 @@ [ObjectMapper databaseGetTableInfoResponseToDictionary:tableInfo]; [responder success:response]; } @catch (NSException* exception) { + NSString* reason = exception.reason ?: @"Unknown error"; NSDictionary* errorResponse = [ObjectMapper errorWithCode:DatabasesErrorCodesSqlExecutionException message:[kDatabasesErrorCodesSqlExecutionExceptionMessage - stringByAppendingString:exception.reason]]; + stringByAppendingString:reason]]; [responder error:errorResponse]; } }]; @@ -215,10 +218,11 @@ [ObjectMapper databaseExecuteSqlResponseToDictionary:sqlResponse]; [responder success:response]; } @catch (NSException* exception) { + NSString* reason = exception.reason ?: @"Unknown error"; NSDictionary* errorResponse = [ObjectMapper errorWithCode:DatabasesErrorCodesSqlExecutionException message:[kDatabasesErrorCodesSqlExecutionExceptionMessage - stringByAppendingString:exception.reason]]; + stringByAppendingString:reason]]; [responder error:errorResponse]; } }];