fluttercommunity · miquelbeltran · Dec 8, 2020 · Dec 8, 2020 · Dec 8, 2020 · Dec 8, 2020
diff --git a/packages/android_alarm_manager_plus/CHANGELOG.md b/packages/android_alarm_manager_plus/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.0
+
+- Renamed Method Channel and changed Java package to avoid collision with android_alarm_manager
+- Needs update in AndroidManifest.xml of your app.
+
 ## 0.5.0
 
 - Transfer to plus-plugins monorepo

diff --git a/packages/android_alarm_manager_plus/README.md b/packages/android_alarm_manager_plus/README.md
@@ -19,14 +19,14 @@ Next, within the `<application></application>` tags, add:
 
 ```xml
 <service
-    android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
+    android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
     android:permission="android.permission.BIND_JOB_SERVICE"
     android:exported="false"/>
 <receiver
-    android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
+    android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
     android:exported="false"/>
 <receiver
-    android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
+    android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
     android:enabled="false">
     <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED"></action>

diff --git a/packages/android_alarm_manager_plus/android/src/main/AndroidManifest.xml b/packages/android_alarm_manager_plus/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="io.flutter.plugins.androidalarmmanager">
+  package="dev.fluttercommunity.plus.androidalarmmanager">
 </manifest>
diff --git a/...dalarmmanager/AlarmBroadcastReceiver.java → ...dalarmmanager/AlarmBroadcastReceiver.java b/...dalarmmanager/AlarmBroadcastReceiver.java → ...dalarmmanager/AlarmBroadcastReceiver.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.androidalarmmanager;
+package dev.fluttercommunity.plus.androidalarmmanager;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

diff --git a/...ins/androidalarmmanager/AlarmService.java → ...lus/androidalarmmanager/AlarmService.java b/...ins/androidalarmmanager/AlarmService.java → ...lus/androidalarmmanager/AlarmService.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.androidalarmmanager;
+package dev.fluttercommunity.plus.androidalarmmanager;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -14,21 +14,16 @@
 import androidx.core.app.AlarmManagerCompat;
 import androidx.core.app.JobIntentService;
 import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 public class AlarmService extends JobIntentService {
   private static final String TAG = "AlarmService";
   private static final String PERSISTENT_ALARMS_SET_KEY = "persistent_alarm_ids";
-  protected static final String SHARED_PREFERENCES_KEY = "io.flutter.android_alarm_manager_plugin";
+  protected static final String SHARED_PREFERENCES_KEY =
+      "dev.fluttercommunity.plus.android_alarm_manager_plugin";
   private static final int JOB_ID = 1984; // Random job ID.
   private static final Object persistentAlarmsLock = new Object();
 

diff --git a/...armmanager/AndroidAlarmManagerPlugin.java → ...armmanager/AndroidAlarmManagerPlugin.java b/...armmanager/AndroidAlarmManagerPlugin.java → ...armmanager/AndroidAlarmManagerPlugin.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.androidalarmmanager;
+package dev.fluttercommunity.plus.androidalarmmanager;
 
 import android.content.Context;
 import android.util.Log;
@@ -83,7 +83,9 @@ public void onAttachedToEngine(Context applicationContext, BinaryMessenger messe
       // - "Alarm.cancel"
       alarmManagerPluginChannel =
           new MethodChannel(
-              messenger, "plugins.flutter.io/android_alarm_manager", JSONMethodCodec.INSTANCE);
+              messenger,
+              "dev.fluttercommunity.plus/android_alarm_manager",
+              JSONMethodCodec.INSTANCE);
 
       // Instantiate a new AndroidAlarmManagerPlugin and connect the primary method channel for
       // Android/Flutter communication.

diff --git a/...armmanager/FlutterBackgroundExecutor.java → ...armmanager/FlutterBackgroundExecutor.java b/...armmanager/FlutterBackgroundExecutor.java → ...armmanager/FlutterBackgroundExecutor.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.androidalarmmanager;
+package dev.fluttercommunity.plus.androidalarmmanager;
 
 import android.content.Context;
 import android.content.Intent;
@@ -234,7 +234,7 @@ private void initializeMethodChannel(BinaryMessenger isolate) {
     backgroundChannel =
         new MethodChannel(
             isolate,
-            "plugins.flutter.io/android_alarm_manager_background",
+            "dev.fluttercommunity.plus/android_alarm_manager_background",
             JSONMethodCodec.INSTANCE);
     backgroundChannel.setMethodCallHandler(this);
   }

diff --git a/...armmanager/PluginRegistrantException.java → ...armmanager/PluginRegistrantException.java b/...armmanager/PluginRegistrantException.java → ...armmanager/PluginRegistrantException.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.androidalarmmanager;
+package dev.fluttercommunity.plus.androidalarmmanager;
 
 class PluginRegistrantException extends RuntimeException {
   public PluginRegistrantException() {

diff --git a/...alarmmanager/RebootBroadcastReceiver.java → ...alarmmanager/RebootBroadcastReceiver.java b/...alarmmanager/RebootBroadcastReceiver.java → ...alarmmanager/RebootBroadcastReceiver.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package io.flutter.plugins.androidalarmmanager;
+package dev.fluttercommunity.plus.androidalarmmanager;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;

diff --git a/packages/android_alarm_manager_plus/example/android/app/src/main/AndroidManifest.xml b/packages/android_alarm_manager_plus/example/android/app/src/main/AndroidManifest.xml
@@ -55,14 +55,14 @@
 
         <!-- Start Alarm Manager -->
         <service
-            android:name="io.flutter.plugins.androidalarmmanager.AlarmService"
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmService"
             android:exported="false"
             android:permission="android.permission.BIND_JOB_SERVICE" />
         <receiver
-            android:name="io.flutter.plugins.androidalarmmanager.AlarmBroadcastReceiver"
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.AlarmBroadcastReceiver"
             android:exported="false" />
         <receiver
-            android:name="io.flutter.plugins.androidalarmmanager.RebootBroadcastReceiver"
+            android:name="dev.fluttercommunity.plus.androidalarmmanager.RebootBroadcastReceiver"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>

diff --git a/...s/ios/Classes/AndroidAlarmManagerPlugin.h → ...s/Classes/AndroidAlarmManagerPlusPlugin.h b/...s/ios/Classes/AndroidAlarmManagerPlugin.h → ...s/Classes/AndroidAlarmManagerPlusPlugin.h
@@ -4,5 +4,5 @@
 
 #import <Flutter/Flutter.h>
 
-@interface FLTAndroidAlarmManagerPlugin : NSObject <FlutterPlugin>
+@interface FLTAndroidAlarmManagerPlusPlugin : NSObject <FlutterPlugin>
 @end
diff --git a/...s/ios/Classes/AndroidAlarmManagerPlugin.m → ...s/Classes/AndroidAlarmManagerPlusPlugin.m b/...s/ios/Classes/AndroidAlarmManagerPlugin.m → ...s/Classes/AndroidAlarmManagerPlusPlugin.m
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "AndroidAlarmManagerPlugin.h"
+#import "AndroidAlarmManagerPlusPlugin.h"
 
-@implementation FLTAndroidAlarmManagerPlugin
+@implementation FLTAndroidAlarmManagerPlusPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
   FlutterMethodChannel* channel =
-      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/android_alarm_manager"
+      [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/android_alarm_manager"
                                   binaryMessenger:[registrar messenger]
                                             codec:[FlutterJSONMethodCodec sharedInstance]];
-  FLTAndroidAlarmManagerPlugin* instance = [[FLTAndroidAlarmManagerPlugin alloc] init];
+  FLTAndroidAlarmManagerPlusPlugin* instance = [[FLTAndroidAlarmManagerPlusPlugin alloc] init];
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 

diff --git a/packages/android_alarm_manager_plus/ios/android_alarm_manager.podspec b/packages/android_alarm_manager_plus/ios/android_alarm_manager.podspec
@@ -2,12 +2,12 @@
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 Pod::Spec.new do |s|
-  s.name             = 'android_alarm_manager'
+  s.name             = 'android_alarm_manager_plus'
   s.version          = '0.0.1'
   s.summary          = 'Flutter Android Alarm Manager'
   s.description      = <<-DESC
 A Flutter plugin for accessing the Android AlarmManager service, and running Dart code in the background when alarms fire.
-This plugin a no-op on iOS. 
+This plugin a no-op on iOS.
 Downloaded by pub (not CocoaPods).
                        DESC
   s.homepage         = 'https://github.com/flutter/plugins'

diff --git a/packages/android_alarm_manager_plus/lib/android_alarm_manager_plus.dart b/packages/android_alarm_manager_plus/lib/android_alarm_manager_plus.dart
@@ -10,7 +10,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 const String _backgroundName =
-    'plugins.flutter.io/android_alarm_manager_background';
+    'dev.fluttercommunity.plus/android_alarm_manager_background';
 
 // This is the entrypoint for the background isolate. Since we can only enter
 // an isolate once, we setup a MethodChannel to listen for method invocations
@@ -62,7 +62,8 @@ typedef _GetCallbackHandle = CallbackHandle Function(Function callback);
 ///
 /// See the example/ directory in this package for sample usage.
 class AndroidAlarmManager {
-  static const String _channelName = 'plugins.flutter.io/android_alarm_manager';
+  static const String _channelName =
+      'dev.fluttercommunity.plus/android_alarm_manager';
   static final MethodChannel _channel =
       const MethodChannel(_channelName, JSONMethodCodec());
 

diff --git a/packages/android_alarm_manager_plus/pubspec.yaml b/packages/android_alarm_manager_plus/pubspec.yaml
@@ -1,7 +1,7 @@
 name: android_alarm_manager_plus
 description: Flutter plugin for accessing the Android AlarmManager service, and
   running Dart code in the background when alarms fire.
-version: 0.5.0
+version: 0.6.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
@@ -18,7 +18,7 @@ flutter:
   plugin:
     platforms:
       android:
-        package: io.flutter.plugins.androidalarmmanager
+        package: dev.fluttercommunity.plus.androidalarmmanager
         pluginClass: AndroidAlarmManagerPlugin
 
 environment:

diff --git a/packages/android_alarm_manager_plus/test/android_alarm_manager_test.dart b/packages/android_alarm_manager_plus/test/android_alarm_manager_test.dart
@@ -13,7 +13,7 @@ void main() {
   void validCallback(int id) => null;
 
   const testChannel = MethodChannel(
-      'plugins.flutter.io/android_alarm_manager', JSONMethodCodec());
+      'dev.fluttercommunity.plus/android_alarm_manager', JSONMethodCodec());
   TestWidgetsFlutterBinding.ensureInitialized();
 
   setUpAll(() {