From 2ab827b98fec2bb9965c937266f1b2bb0c6dd064 Mon Sep 17 00:00:00 2001
From: Yaakov Schectman <schectman@google.com>
Date: Wed, 30 Oct 2024 16:36:42 -0400
Subject: [PATCH 1/2] Gets app working on stable

---
 android/build.gradle                          |  1 +
 android/src/main/AndroidManifest.xml          |  3 +-
 .../ContactsServicePlugin.java                |  3 +-
 example/android/app/build.gradle              |  3 +-
 .../android/app/src/main/AndroidManifest.xml  |  3 +-
 example/android/build.gradle                  |  4 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +--
 example/lib/contacts_list_page.dart           | 30 +++++++++----------
 example/lib/contacts_picker_page.dart         |  6 ++--
 example/lib/main.dart                         |  2 +-
 example/pubspec.yaml                          |  6 ++--
 11 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 2feed78f..783d40a1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -23,6 +23,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 30
+    namespace "flutter.plugins.contactsservice.contactsservice"
 
     defaultConfig {
         minSdkVersion 16
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index a0d08137..3dff9547 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="flutter.plugins.contactsservice.contactsservice">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <queries>
         <intent>
             <action android:name="android.accounts.AccountAuthenticator" />
diff --git a/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java b/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java
index 8c69de78..a185e75f 100644
--- a/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java
+++ b/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java
@@ -295,8 +295,9 @@ public boolean onActivityResult(int requestCode, int resultCode, Intent intent)
         } else {
           Log.e(LOG_TAG, "onActivityResult - cursor.moveToFirst() returns false");
           finishWithResult(FORM_OPERATION_CANCELED);
-        }}else{return true;}
+        }
         cursor.close();
+          }else{return true;}
         return true;
       }
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index f8e8aad1..7afb451e 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -15,7 +15,8 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
+    namespace "flutter.plugins.contactsservice.contactsserviceexample"
 
     lintOptions {
         disable 'InvalidPackage'
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index c736548a..31edda6e 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="flutter.plugins.contactsservice.contactsserviceexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 7fe1f186..30c5769f 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
     }
 }
 
@@ -22,6 +22,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index de2ccd60..fd30d074 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Wed Oct 30 16:21:51 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/example/lib/contacts_list_page.dart b/example/lib/contacts_list_page.dart
index 5f6b773e..0b2a007a 100644
--- a/example/lib/contacts_list_page.dart
+++ b/example/lib/contacts_list_page.dart
@@ -11,7 +11,7 @@ class ContactListPage extends StatefulWidget {
 }
 
 class _ContactListPageState extends State<ContactListPage> {
-  List<Contact> _contacts;
+  List<Contact> _contacts = [];
 
   @override
   void initState() {
@@ -40,7 +40,7 @@ class _ContactListPageState extends State<ContactListPage> {
 
   void updateContact() async {
     Contact ninja = _contacts
-        .firstWhere((contact) => contact.familyName.startsWith("Ninja"));
+        .firstWhere((contact) => contact.familyName?.startsWith("Ninja") == true);
     ninja.avatar = null;
     await ContactsService.updateContact(ninja);
 
@@ -90,7 +90,7 @@ class _ContactListPageState extends State<ContactListPage> {
             ? ListView.builder(
                 itemCount: _contacts?.length ?? 0,
                 itemBuilder: (BuildContext context, int index) {
-                  Contact c = _contacts?.elementAt(index);
+                  Contact c = _contacts.elementAt(index);
                   return ListTile(
                     onTap: () {
                       Navigator.of(context).push(MaterialPageRoute(
@@ -100,8 +100,8 @@ class _ContactListPageState extends State<ContactListPage> {
                                     contactOnDeviceHasBeenUpdated,
                               )));
                     },
-                    leading: (c.avatar != null && c.avatar.length > 0)
-                        ? CircleAvatar(backgroundImage: MemoryImage(c.avatar))
+                    leading: (c.avatar != null && c.avatar!.length > 0)
+                        ? CircleAvatar(backgroundImage: MemoryImage(c.avatar!))
                         : CircleAvatar(child: Text(c.initials())),
                     title: Text(c.displayName ?? ""),
                   );
@@ -126,14 +126,14 @@ class ContactDetailsPage extends StatelessWidget {
   ContactDetailsPage(this._contact, {this.onContactDeviceSave});
 
   final Contact _contact;
-  final Function(Contact) onContactDeviceSave;
+  final Function(Contact)? onContactDeviceSave;
 
   _openExistingContactOnDevice(BuildContext context) async {
     try {
       var contact = await ContactsService.openExistingContact(_contact,
           iOSLocalizedLabels: iOSLocalizedLabels);
       if (onContactDeviceSave != null) {
-        onContactDeviceSave(contact);
+        onContactDeviceSave!(contact);
       }
       Navigator.of(context).pop();
     } on FormOperationException catch (e) {
@@ -202,7 +202,7 @@ class ContactDetailsPage extends StatelessWidget {
             ListTile(
               title: Text("Birthday"),
               trailing: Text(_contact.birthday != null
-                  ? DateFormat('dd-MM-yyyy').format(_contact.birthday)
+                  ? DateFormat('dd-MM-yyyy').format(_contact.birthday!)
                   : ""),
             ),
             ListTile(
@@ -219,9 +219,9 @@ class ContactDetailsPage extends StatelessWidget {
                   ? _contact.androidAccountType.toString()
                   : ""),
             ),
-            AddressesTile(_contact.postalAddresses),
-            ItemsTile("Phones", _contact.phones),
-            ItemsTile("Emails", _contact.emails)
+            AddressesTile(_contact.postalAddresses!),
+            ItemsTile("Phones", _contact.phones!),
+            ItemsTile("Emails", _contact.emails!)
           ],
         ),
       ),
@@ -323,7 +323,7 @@ class _AddContactPageState extends State<AddContactPage> {
         actions: <Widget>[
           TextButton(
             onPressed: () {
-              _formKey.currentState.save();
+              _formKey.currentState?.save();
               contact.postalAddresses = [address];
               ContactsService.addContact(contact);
               Navigator.of(context).pop();
@@ -407,7 +407,7 @@ class _AddContactPageState extends State<AddContactPage> {
 }
 
 class UpdateContactsPage extends StatefulWidget {
-  UpdateContactsPage({@required this.contact});
+  UpdateContactsPage({required this.contact});
 
   final Contact contact;
 
@@ -416,7 +416,7 @@ class UpdateContactsPage extends StatefulWidget {
 }
 
 class _UpdateContactsPageState extends State<UpdateContactsPage> {
-  Contact contact;
+  late Contact contact;
   PostalAddress address = PostalAddress(label: "Home");
   final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
 
@@ -438,7 +438,7 @@ class _UpdateContactsPageState extends State<UpdateContactsPage> {
               color: Colors.white,
             ),
             onPressed: () async {
-              _formKey.currentState.save();
+              _formKey.currentState?.save();
               contact.postalAddresses = [address];
               await ContactsService.updateContact(contact);
               Navigator.of(context).pushReplacement(
diff --git a/example/lib/contacts_picker_page.dart b/example/lib/contacts_picker_page.dart
index e3ebaadd..ca35366e 100644
--- a/example/lib/contacts_picker_page.dart
+++ b/example/lib/contacts_picker_page.dart
@@ -9,7 +9,7 @@ class ContactPickerPage extends StatefulWidget {
 }
 
 class _ContactPickerPageState extends State<ContactPickerPage> {
-  Contact _contact;
+  Contact? _contact;
 
   @override
   void initState() {
@@ -18,7 +18,7 @@ class _ContactPickerPageState extends State<ContactPickerPage> {
 
   Future<void> _pickContact() async {
     try {
-      final Contact contact = await ContactsService.openDeviceContactPicker(
+      final Contact? contact = await ContactsService.openDeviceContactPicker(
           iOSLocalizedLabels: iOSLocalizedLabels);
       setState(() {
         _contact = contact;
@@ -40,7 +40,7 @@ class _ContactPickerPageState extends State<ContactPickerPage> {
             onPressed: _pickContact,
           ),
           if (_contact != null)
-            Text('Contact selected: ${_contact.displayName}'),
+            Text('Contact selected: ${_contact!.displayName}'),
         ],
       )),
     );
diff --git a/example/lib/main.dart b/example/lib/main.dart
index cc78ac35..e4b59876 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -35,7 +35,7 @@ class _HomePageState extends State<HomePage> {
     _askPermissions(null);
   }
 
-  Future<void> _askPermissions(String routeName) async {
+  Future<void> _askPermissions(String? routeName) async {
     PermissionStatus permissionStatus = await _getContactPermission();
     if (permissionStatus == PermissionStatus.granted) {
       if (routeName != null) {
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index f2c15eb8..7153be75 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,7 +1,7 @@
 name: contacts_service_example
 description: Demonstrates how to use the contacts_service plugin.
 environment:
-  sdk: '>=2.10.0 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 dependencies:
   flutter:
     sdk: flutter
@@ -9,13 +9,13 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
-  intl: ^0.17.0
+  intl: ^0.19.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  permission_handler: ^6.1.1
+  permission_handler: ^11.0.1
   contacts_service:
     path: ../
 

From 94b51681f9302bcd5387b0d5e119c502c90f13ba Mon Sep 17 00:00:00 2001
From: Yaakov Schectman <schectman@google.com>
Date: Wed, 30 Oct 2024 17:00:46 -0400
Subject: [PATCH 2/2] Removes v1 embedding references, bumps version

---
 CHANGELOG.md                                  |  5 ++++
 .../ContactsServicePlugin.java                | 29 -------------------
 example/android/app/build.gradle              |  4 +--
 pubspec.yaml                                  |  2 +-
 4 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ccf4540..60b0a7fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.6.4] - October 30, 2024
+
+* Add null safety to example app
+* Remove v1 Flutter Android embedding references
+
 ## [0.6.3] - September 21, 2021
 
 * Android: added method getContactsByEmail (@fjbatresv)
diff --git a/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java b/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java
index a185e75f..b8e195ec 100644
--- a/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java
+++ b/android/src/main/java/flutter/plugins/contactsservice/contactsservice/ContactsServicePlugin.java
@@ -41,7 +41,6 @@
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
 import io.flutter.plugin.common.MethodChannel.Result;
 import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 import static android.app.Activity.RESULT_CANCELED;
 import static android.provider.ContactsContract.CommonDataKinds;
@@ -66,16 +65,6 @@ public class ContactsServicePlugin implements MethodCallHandler, FlutterPlugin,
   private final ExecutorService executor =
           new ThreadPoolExecutor(0, 10, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(1000));
 
-  private void initDelegateWithRegister(Registrar registrar) {
-    this.delegate = new ContactServiceDelegateOld(registrar);
-  }
-
-  public static void registerWith(Registrar registrar) {
-    ContactsServicePlugin instance = new ContactsServicePlugin();
-    instance.initInstance(registrar.messenger(), registrar.context());
-    instance.initDelegateWithRegister(registrar);
-  }
-
   private void initInstance(BinaryMessenger messenger, Context context) {
     methodChannel = new MethodChannel(messenger, "github.com/clovisnicolas/flutter_contacts");
     methodChannel.setMethodCallHandler(this);
@@ -375,24 +364,6 @@ private void openDeviceContactPicker(Result result, boolean localizedLabels) {
         result.success(FORM_COULD_NOT_BE_OPEN);
       }
   }
-  
-  private class ContactServiceDelegateOld extends BaseContactsServiceDelegate {
-    private final PluginRegistry.Registrar registrar;
-
-    ContactServiceDelegateOld(PluginRegistry.Registrar registrar) {
-      this.registrar = registrar;
-      registrar.addActivityResultListener(this);
-    }
-
-    @Override
-    void startIntent(Intent intent, int request) {
-      if (registrar.activity() != null) {
-        registrar.activity().startActivityForResult(intent, request);
-      } else {
-        registrar.context().startActivity(intent);
-      }
-    }
-  }
 
   private class ContactServiceDelegate extends BaseContactsServiceDelegate {
     private final Context context;
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 7afb451e..d9024a3f 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -25,7 +25,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "flutter.plugins.contactsservice.contactsserviceexample"
-        minSdkVersion 16
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
@@ -48,4 +48,4 @@ flutter {
 dependencies {
     androidTestImplementation 'androidx.test:runner:1.1.0'
     androidTestImplementation 'androidx.test:rules:1.1.0'
-}
\ No newline at end of file
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index 69944cdf..3365d905 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: contacts_service
 description: A Flutter plugin to retrieve and manage contacts on Android and iOS devices.
-version: 0.6.3
+version: 0.6.4
 homepage: https://github.com/lukasgit/flutter_contacts
 maintainer: Lukas Dickie (@lukasgit)