Merge pull request #46 from appspector/develop

Release 0.7.0

Author: Dimdron

.github/workflows/check.yml

@@ -16,7 +16,7 @@ jobs:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '1.22.4'
+          flutter-version: '2.0.3'
       - run: flutter pub get
       - run: flutter pub publish -n
       - run: ./test_ios.sh

.github/workflows/publish.yml

@@ -18,7 +18,7 @@ jobs:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '1.22.6'
+          flutter-version: '2.0.3'
       - run: mkdir -p $FLUTTER_HOME/.pub-cache && echo $CREDENTIALS_JSON > $FLUTTER_HOME/.pub-cache/credentials.json
       - run: flutter pub get
       - run: flutter pub publish -f

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.0 31 Mar 2021
+* Support Flutter 2 and Dart null-safety
+* Fix issue with missing OnSessionUrlListener
+
 ## 0.6.2 30 Mar 2021
 * Add internal updates
 

README.md

@@ -43,7 +43,7 @@ API keys required for the SDK initialisation will be available on the Apps setti
 ## Add AppSpector plugin to pubspec.yaml
 ```yaml
 dependencies
-  appspector: '0.6.2'
+  appspector: '0.7.0'
 ```
 
 ## Initialize AppSpector plugin

example/lib/http/app_http_client.dart

@@ -1,3 +1,4 @@
+
 import 'dart:convert';
 import 'dart:io' show HttpClient, HttpClientRequest, HttpHeaders;
 
@@ -28,14 +29,14 @@ abstract class AppHttpClient {
 class FlutterHttpClient extends AppHttpClient {
   @override
   Future<int> executeDelete(String url) {
-    return http.delete(url).then((response) {
+    return http.delete(Uri.parse(url)).then((response) {
       return response.statusCode;
     });
   }
 
   @override
   Future<int> executeGet(String url) {
-    return http.get(url).then((response) {
+    return http.get(Uri.parse(url)).then((response) {
       return response.statusCode;
     });
   }
@@ -44,15 +45,15 @@ class FlutterHttpClient extends AppHttpClient {
   Future<int> executeGetImage() {
     return http
         .get(
-            "https://raw.githubusercontent.com/appspector/android-sdk/master/images/github-cover.png")
+        Uri.parse("https://raw.githubusercontent.com/appspector/android-sdk/master/images/github-cover.png"))
         .then((response) {
       return response.statusCode;
     });
   }
 
   @override
   Future<int> executeHead(String url) {
-    return http.head(url).then((response) {
+    return http.head(Uri.parse(url)).then((response) {
       return response.statusCode;
     });
   }
@@ -65,7 +66,7 @@ class FlutterHttpClient extends AppHttpClient {
   @override
   Future<int> executePatch(String url) async {
     final body = await rootBundle.loadString("assets/patch.json");
-    return http.patch(url, body: body).then((response) {
+    return http.patch(Uri.parse(url), body: body).then((response) {
       return response.statusCode;
     });
   }
@@ -81,15 +82,15 @@ class FlutterHttpClient extends AppHttpClient {
       "fcmToken": "svsdfvdsvf"
     }""";
     final headers = {"Content-Type": "application/json; charset=utf-8"};
-    return http.post(url, headers: headers, body: data).then((response) {
+    return http.post(Uri.parse(url), headers: headers, body: data).then((response) {
       return response.statusCode;
     });
   }
 
   @override
   Future<int> executePut(String url) async {
     final body = await rootBundle.loadString("assets/put.json");
-    return http.put(url, body: body).then((response) {
+    return http.put(Uri.parse(url), body: body).then((response) {
       return response.statusCode;
     });
   }
@@ -186,28 +187,28 @@ class DioHttpClient extends AppHttpClient {
   @override
   Future<int> executeDelete(String url) {
     return dio.delete(url).then((response) {
-      return response.statusCode;
+      return response.statusCode ?? 0;
     });
   }
 
   @override
   Future<int> executeGet(String url) {
     return dio.get(url).then((response) {
-      return response.statusCode;
+      return response.statusCode ?? 0;
     });
   }
 
   @override
   Future<int> executeGetImage() {
     return dio.get("https://raw.githubusercontent.com/appspector/android-sdk/master/images/github-cover.png").then((response) {
-      return response.statusCode;
+      return response.statusCode ?? 0;
     });
   }
 
   @override
   Future<int> executeHead(String url) {
     return dio.head(url).then((response) {
-      return response.statusCode;
+      return response.statusCode ?? 0;
     });
   }
 
@@ -219,7 +220,7 @@ class DioHttpClient extends AppHttpClient {
   @override
   Future<int> executePatch(String url) {
     return dio.patch(url).then((response) {
-      return response.statusCode;
+      return response.statusCode ?? 0;
     });
   }
 
@@ -233,14 +234,14 @@ class DioHttpClient extends AppHttpClient {
       'fcmToken': 'svsdfvdsvf'
     };
     return dio.post(url, data: data).then((response) {
-      return response.statusCode;
+      return response.statusCode ?? 0;
     });
   }
 
   @override
   Future<int> executePut(String url) {
     return dio.put(url).then((response) {
-      return response.statusCode;
+      return response.statusCode ?? 0;
     });
   }
 

example/lib/http_page.dart

@@ -1,3 +1,4 @@
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 
 import 'app_drawer.dart';
@@ -50,9 +51,9 @@ class HttpMonitorPageState extends State<HttpMonitorPage> {
   ];
 
   int _selectedClient = _CLIENT_HTTP_LIB;
-  int _statusCode;
-  String _error;
-  int _requestDuration;
+  int? _statusCode;
+  String? _error;
+  int? _requestDuration;
 
   @override
   Widget build(BuildContext context) {
@@ -120,14 +121,10 @@ class HttpMonitorPageState extends State<HttpMonitorPage> {
               child: Text(item.title),
               onPressed: () {
                 Stopwatch stopwatch = Stopwatch()..start();
-                try {
-                  item.action(_provideClient(), _url).then((responseCode) {
-                    _onHttpResponse(
-                        responseCode, stopwatch.elapsedMilliseconds);
-                  });
-                } catch(e) {
-                  _onHttpError(e);
-                }
+                item.action(_provideClient(), _url).then((responseCode) {
+                  _onHttpResponse(responseCode, stopwatch.elapsedMilliseconds);
+                }).onError(
+                    (error, stackTrace) => _onHttpError(error as Exception, stopwatch.elapsedMilliseconds));
               }));
     }).toList();
   }
@@ -149,11 +146,11 @@ class HttpMonitorPageState extends State<HttpMonitorPage> {
     });
   }
 
-  _onHttpError(Exception e) {
+  _onHttpError(Exception e, int requestDuration) {
     setState(() {
       _statusCode = null;
-      _requestDuration = null;
-      _error = e.toString();
+      _requestDuration = requestDuration;
+      _error = e is DioError ? e.message + " (" + requestDuration.toString() + " ms)" : e.toString();
     });
   }
 
@@ -170,9 +167,9 @@ class HttpMonitorPageState extends State<HttpMonitorPage> {
     return [TextSpan(text: "Click any button")];
   }
 
-  _onClientSelectChanged(int newValue) {
+  _onClientSelectChanged(int? newValue) {
     setState(() {
-      _selectedClient = newValue;
+      _selectedClient = newValue ?? _CLIENT_HTTP_LIB;
     });
   }
 }

example/lib/main.dart

@@ -45,7 +45,7 @@ void runAppSpector(DataObservable<String> sessionObserver) {
     ];
 
   AppSpectorPlugin.run(config);
-  AppSpectorPlugin.shared()?.sessionUrlListener =
+  AppSpectorPlugin.shared().sessionUrlListener =
       (sessionUrl) => {sessionObserver.setValue(sessionUrl)};
 }
 

example/lib/main_page.dart

@@ -9,7 +9,7 @@ import 'utils.dart';
 class MyHomePage extends StatefulWidget {
   final DataObservable<String> _sessionUrlObserver;
 
-  MyHomePage(this._sessionUrlObserver, {Key key, this.title}) : super(key: key);
+  MyHomePage(this._sessionUrlObserver, {Key? key, required this.title}) : super(key: key);
 
   // This widget is the home page of your application. It is stateful, meaning
   // that it has a State object (defined below) that contains fields that affect
@@ -32,7 +32,7 @@ class _MyHomePageState extends State<MyHomePage> {
   int _counter = 0;
 
   bool isSdkRunning = true;
-  String _sessionUrl;
+  late String _sessionUrl;
 
   _MyHomePageState(DataObservable<String> sessionUrlObserver) {
     sessionUrlObserver.observer = (sessionUrl) => {

example/lib/sqlite/storage.dart

@@ -1,3 +1,4 @@
+
 import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:sqflite/sqflite.dart';
@@ -10,24 +11,23 @@ abstract class RecordStorage {
 }
 
 class RecordStorageImpl implements RecordStorage {
-  static Database _db;
+  static Database? _db;
   static const _tableName = "records";
   static const _columnId = "id";
   static const _columnName = "name";
   static const _columnAddress = "address";
   static const _columnPhone = "phone";
 
   Future<Database> get db async {
-    if (_db != null) return _db;
-    _db = await initDb();
-    return _db;
+    return _db ?? await initDb();
   }
 
   //Creating a database with name test.db in your directory
   initDb() async {
     var dbPath = await getDatabasesPath() + "/test.db";
-    var theDb = await openDatabase(dbPath, version: 1, onCreate: _onCreate);
-    return theDb;
+    var db = await openDatabase(dbPath, version: 1, onCreate: _onCreate);
+    _db = db;
+    return db;
   }
 
   // Creating a table name Employee with fields

example/lib/utils.dart

@@ -1,16 +1,16 @@
 class DataObservable<T> {
 
-  T _value;
+  T? _value;
 
-  Function(T) observer;
+  Function(T)? observer;
 
   void setValue(T value) {
     this._value = value;
     if (observer != null) {
-      observer(value);
+      observer!(value);
     }
   }
 
-  T getValue() => _value;
+  T? getValue() => _value;
 
 }