Migrate to Null Safety and remove usage of deprecated code

README.md

@@ -1,7 +1,7 @@
 [![pub package](https://img.shields.io/pub/v/root_access.svg)](https://pub.dartlang.org/packages/root_access)
 
 # Root access Plugin
-A Flutter plugin for getting root access in Android apps.
+A Flutter plugin for requesting root access in Android apps.
 
 #### This plugin is based on [RootTools](https://github.com/Stericson/RootTools) by [Stericson](https://github.com/Stericson).
 
@@ -24,13 +24,13 @@ bool _rootStatus = false;
 
 The ```RootAccess``` class provides a getter to get root access and status
 ```dart
-bool rootStatus = await RootAccess.rootAccess;
+bool rootStatus = await RootAccess.requestRootAccess;
 ```
 
 Declare an async method to retrieve root access
 ```dart
 Future<void> initRootRequest() async {
-    bool rootStatus = await RootAccess.rootAccess;
+    bool rootStatus = await RootAccess.requestRootAccess;
     setState(() {
       _rootStatus = rootStatus;
     });

android/src/main/java/com/amitkhairnar/rootaccess/RootAccessPlugin.java

@@ -9,23 +9,14 @@
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 /**
  * RootAccessPlugin
  */
 public class RootAccessPlugin implements FlutterPlugin, MethodCallHandler {
-    /**
-     * Plugin registration.
-     */
 
     private MethodChannel channel;
 
-    public static void registerWith(Registrar registrar) {
-        final MethodChannel channel = new MethodChannel(registrar.messenger(), "root_access");
-        channel.setMethodCallHandler(new RootAccessPlugin());
-    }
-
     @Override
     public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         if (call.method.equals("isAccessGiven")) {
@@ -41,7 +32,7 @@ private boolean isAccessGiven() {
 
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
-        channel = new MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), "root_access");
+        channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "root_access");
         channel.setMethodCallHandler(this);
     }
 

example/android/app/src/main/AndroidManifest.xml

@@ -13,7 +13,6 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="root_access_example"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -35,5 +34,8 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>

example/android/app/src/main/java/com/amitkhairnar/rootaccessexample/MainActivity.java

@@ -1,13 +1,5 @@
 package com.amitkhairnar.rootaccessexample;
 
-import android.os.Bundle;
-import io.flutter.app.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.embedding.android.FlutterActivity;
 
-public class MainActivity extends FlutterActivity {
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    GeneratedPluginRegistrant.registerWith(this);
-  }
-}
+public class MainActivity extends FlutterActivity { }

example/lib/main.dart

@@ -20,7 +20,7 @@ class _MyAppState extends State<MyApp> {
   }
 
   Future<void> initRootRequest() async {
-    bool rootAccess = await RootAccess.rootAccess;
+    bool rootAccess = await RootAccess.requestRootAccess;
 
     // If the widget was removed from the tree while the asynchronous platform
     // message was in flight, we want to discard the reply rather than calling
@@ -34,13 +34,13 @@ class _MyAppState extends State<MyApp> {
 
   @override
   Widget build(BuildContext context) {
-    return new MaterialApp(
-      home: new Scaffold(
-        appBar: new AppBar(
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
           title: const Text('Plugin example app'),
         ),
-        body: new Center(
-          child: new Text('Root access granted: $_rootAccess\n'),
+        body: Center(
+          child: Text('Root access granted: $_rootAccess\n'),
         ),
       ),
     );

example/pubspec.yaml

@@ -1,6 +1,9 @@
 name: root_access_example
 description: Demonstrates how to use the root_access plugin.
 
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+
 dependencies:
   flutter:
     sdk: flutter

example/test/widget_test.dart

@@ -18,7 +18,7 @@ void main() {
     expect(
         find.byWidgetPredicate(
           (Widget widget) =>
-              widget is Text && widget.data.startsWith('Root access granted:'),
+              widget is Text && widget.data!.startsWith('Root access granted:'),
         ),
         findsOneWidget);
   });

lib/root_access.dart

@@ -5,14 +5,20 @@ import 'package:flutter/services.dart';
 /// Provides a way to get root access.
 class RootAccess {
   /// Channel used to communicate to native code.
-  static const MethodChannel channel = const MethodChannel('root_access');
+  static const MethodChannel _channel = const MethodChannel('root_access');
 
-  /// Triggers app to get root access
+  @Deprecated("Use requestRootAccess instead")
+  static Future<bool> get rootAccess async {
+    final bool access = await _channel.invokeMethod('isAccessGiven');
+    return access;
+  }
+
+  /// Triggers app to request root access
   ///
   /// If device is not rooted then this will return `false`.
   /// Else it will open installed superuser or similar app's pop up asking for Permission.
-  static Future<bool> get rootAccess async {
-    final bool access = await channel.invokeMethod('isAccessGiven');
+  static Future<bool> get requestRootAccess async {
+    final bool access = await _channel.invokeMethod('isAccessGiven');
     return access;
   }
 }

pubspec.yaml

@@ -1,11 +1,11 @@
 name: root_access
-description: Flutter plugin to get root access in Android device. This plugin is Android exclusive only.
-version: 1.0.3
+description: Flutter plugin to request root access in Android device. This plugin is Android exclusive only.
+version: 1.0.4
 homepage: https://github.com/amitkhairnar44/root_access
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
-  flutter: ">=1.10.0"
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=2.0.0"
 
 dependencies:
   flutter:

test/root_access_test.dart

@@ -0,0 +1,23 @@
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:root_access/root_access.dart';
+
+void main() {
+  const MethodChannel channel = MethodChannel('root_access');
+
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  setUp(() {
+    channel.setMockMethodCallHandler((MethodCall methodCall) async {
+      return false;
+    });
+  });
+
+  tearDown(() {
+    channel.setMockMethodCallHandler(null);
+  });
+
+  test('isAccessGiven', () async {
+    expect(await RootAccess.requestRootAccess, false);
+  });
+}