diff --git a/packages/android_alarm_manager_plus/CHANGELOG.md b/packages/android_alarm_manager_plus/CHANGELOG.md index 5357d57db9..d0a27e8d62 100644 --- 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 index 83e3a05fdd..52d64cc552 100644 --- a/packages/android_alarm_manager_plus/README.md +++ b/packages/android_alarm_manager_plus/README.md @@ -19,14 +19,14 @@ Next, within the `` tags, add: ```xml diff --git a/packages/android_alarm_manager_plus/android/src/main/AndroidManifest.xml b/packages/android_alarm_manager_plus/android/src/main/AndroidManifest.xml index de6d16c038..d963302ea8 100644 --- 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 @@ + package="dev.fluttercommunity.plus.androidalarmmanager"> diff --git a/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AlarmBroadcastReceiver.java similarity index 96% rename from packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java rename to packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AlarmBroadcastReceiver.java index a8968a2095..8567f5a26c 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmBroadcastReceiver.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/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/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AlarmService.java similarity index 97% rename from packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java rename to packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AlarmService.java index fb6e7f85b3..72d07b3a3d 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AlarmService.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/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,13 +14,7 @@ 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; @@ -28,7 +22,8 @@ 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/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java similarity index 98% rename from packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java rename to packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/AndroidAlarmManagerPlugin.java index 2f3f5f9f29..006ef9f1e9 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/AndroidAlarmManagerPlugin.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/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/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/FlutterBackgroundExecutor.java similarity index 98% rename from packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java rename to packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/FlutterBackgroundExecutor.java index 4e755c3155..966a571fc0 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/FlutterBackgroundExecutor.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/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/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/PluginRegistrantException.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/PluginRegistrantException.java similarity index 88% rename from packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/PluginRegistrantException.java rename to packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/PluginRegistrantException.java index debcd7ee75..d135bcc23e 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/PluginRegistrantException.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/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/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/RebootBroadcastReceiver.java similarity index 97% rename from packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java rename to packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/RebootBroadcastReceiver.java index b920afa1c1..81acc06ce7 100644 --- a/packages/android_alarm_manager_plus/android/src/main/java/io/flutter/plugins/androidalarmmanager/RebootBroadcastReceiver.java +++ b/packages/android_alarm_manager_plus/android/src/main/java/dev/fluttercommunity/plus/androidalarmmanager/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 index f5f1a7ab24..c29f71d596 100644 --- 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 @@ diff --git a/packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlugin.h b/packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlusPlugin.h similarity index 73% rename from packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlugin.h rename to packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlusPlugin.h index 595fcf60fe..f9eb398e73 100644 --- a/packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlugin.h +++ b/packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlusPlugin.h @@ -4,5 +4,5 @@ #import -@interface FLTAndroidAlarmManagerPlugin : NSObject +@interface FLTAndroidAlarmManagerPlusPlugin : NSObject @end diff --git a/packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlugin.m b/packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlusPlugin.m similarity index 68% rename from packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlugin.m rename to packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlusPlugin.m index 0aa4f2b212..affbc9e083 100644 --- a/packages/android_alarm_manager_plus/ios/Classes/AndroidAlarmManagerPlugin.m +++ b/packages/android_alarm_manager_plus/ios/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*)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 index 8526160c53..c0af515903 100644 --- 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 index d767833020..4b498ee3d0 100644 --- 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 index 077123c653..6fa299178e 100644 --- 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 index 0cfce073e7..69939245dd 100644 --- 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(() {