Skip to content

Commit 40cfdaa

Browse files
refactor: rename logger classes in Android and iOS
- Rename FlutterOptimizelyLogger to OptimizelyFlutterLogger in Android - Rename FlutterOptimizelyLogger to OptimizelyFlutterLogger in iOS
1 parent 6336b0c commit 40cfdaa

File tree

8 files changed

+28
-18
lines changed

8 files changed

+28
-18
lines changed

android/src/main/java/com/optimizely/optimizely_flutter_sdk/OptimizelyFlutterClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ protected void initializeOptimizely(@NonNull ArgumentsParser argumentsParser, @N
192192
Boolean useCustomLogger = argumentsParser.getCustomLogger();
193193
Logger customLogger = null;
194194
if (useCustomLogger != null && useCustomLogger) {
195-
customLogger = new FlutterOptimizelyLogger("OptimizelySDK");
195+
customLogger = new OptimizelyFlutterLogger("OptimizelySDK");
196196
optimizelyManagerBuilder.withLogger(customLogger);
197197
}
198198

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import java.util.HashMap;
2424
import java.util.Map;
2525

26-
public class FlutterOptimizelyLogger implements Logger {
26+
public class OptimizelyFlutterLogger implements Logger {
2727
static final String LOGGER_CHANNEL = "optimizely_flutter_sdk_logger";
2828
private static MethodChannel loggerChannel;
2929
private final String tag;
3030

31-
public FlutterOptimizelyLogger(String name) {
31+
public OptimizelyFlutterLogger(String name) {
3232
tag = name;
3333
}
3434

android/src/main/java/com/optimizely/optimizely_flutter_sdk/OptimizelyFlutterSdkPlugin.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,21 +157,18 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
157157
public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
158158
channel = new MethodChannel(binding.getBinaryMessenger(), "optimizely_flutter_sdk");
159159
channel.setMethodCallHandler(this);
160-
161-
// Logger channel for custom logging
162-
loggerChannel = new MethodChannel(binding.getBinaryMessenger(), FlutterOptimizelyLogger.LOGGER_CHANNEL);
163-
164-
// Set the logger channel in your logger class
165-
FlutterOptimizelyLogger.setChannel(loggerChannel);
160+
161+
loggerChannel = new MethodChannel(binding.getBinaryMessenger(), OptimizelyFlutterLogger.LOGGER_CHANNEL);
162+
OptimizelyFlutterLogger.setChannel(loggerChannel);
166163

167164
context = binding.getApplicationContext();
168165
}
169166

170167
@Override
171168
public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
172169
channel.setMethodCallHandler(null);
173-
loggerChannel.setMethodCallHandler(null); // Clean up logger channel
174-
FlutterOptimizelyLogger.setChannel(null);
170+
loggerChannel.setMethodCallHandler(null);
171+
OptimizelyFlutterLogger.setChannel(null);
175172
}
176173

177174
@Override

example/lib/custom_logger.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import 'package:optimizely_flutter_sdk/optimizely_flutter_sdk.dart';
2+
import 'package:flutter/foundation.dart';
23

34
class CustomLogger implements OptimizelyLogger {
45
@override
56
OptimizelyLogLevel logLevel = OptimizelyLogLevel.debug;
67

78
@override
89
void log(OptimizelyLogLevel level, String message) {
9-
print('[Flutter LOGGER] ${level.name}: $message');
10+
if (kDebugMode) {
11+
print('[Flutter LOGGER] ${level.name}: $message');
12+
}
1013
}
1114
}

example/lib/main.dart

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ import 'package:flutter/material.dart';
22
import 'dart:async';
33
import 'dart:math';
44
import 'package:optimizely_flutter_sdk/optimizely_flutter_sdk.dart';
5+
import 'package:optimizely_flutter_sdk_example/custom_logger.dart';
6+
7+
/**
8+
* Logger TODO:
9+
* Check thread safety
10+
* Android logger fix
11+
* Add unit test
12+
*/
513

614
void main() {
715
runApp(const MyApp());
@@ -28,16 +36,20 @@ class _MyAppState extends State<MyApp> {
2836
OptimizelyDecideOption.includeReasons,
2937
OptimizelyDecideOption.excludeVariables
3038
};
39+
final customLogger = CustomLogger();
40+
3141
var flutterSDK = OptimizelyFlutterSdk("X9mZd2WDywaUL9hZXyh9A",
3242
datafilePeriodicDownloadInterval: 10 * 60,
3343
eventOptions: const EventOptions(
3444
batchSize: 1, timeInterval: 60, maxQueueSize: 10000),
3545
defaultLogLevel: OptimizelyLogLevel.debug,
36-
defaultDecideOptions: defaultOptions);
46+
defaultDecideOptions: defaultOptions,
47+
logger: customLogger,
48+
);
3749
var response = await flutterSDK.initializeClient();
3850

3951
setState(() {
40-
uiResponse = "Optimizely Client initialized: ${response.success} ";
52+
uiResponse = "[Optimizely] Client initialized: ${response.success} ";
4153
});
4254

4355
var rng = Random();

ios/Classes/FlutterOptimizelyLogger.swift renamed to ios/Classes/OptimizelyFlutterLogger.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Flutter
22
import Optimizely
33

4-
public class FlutterOptimizelyLogger: NSObject, OPTLogger {
4+
public class OptimizelyFlutterLogger: NSObject, OPTLogger {
55
public static var logLevel: OptimizelyLogLevel = .info
66

77
private static let loggerChannel = FlutterMethodChannel(

ios/Classes/SwiftOptimizelyFlutterSdkPlugin.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public class SwiftOptimizelyFlutterSdkPlugin: NSObject, FlutterPlugin {
168168
// Check if custom logger is requested
169169
var logger: OPTLogger?
170170
if let useCustomLogger = parameters[RequestParameterKey.customLogger] as? Bool, useCustomLogger {
171-
logger = FlutterOptimizelyLogger()
171+
logger = OptimizelyFlutterLogger()
172172
}
173173

174174
// Creating new instance

lib/src/optimizely_client_wrapper.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import 'package:optimizely_flutter_sdk/src/data_objects/get_vuid_response.dart';
2727
import 'package:optimizely_flutter_sdk/src/data_objects/optimizely_config_response.dart';
2828
import 'package:optimizely_flutter_sdk/src/utils/constants.dart';
2929
import 'package:optimizely_flutter_sdk/src/utils/utils.dart';
30-
import 'package:optimizely_flutter_sdk/src/logger/flutter_logger.dart';
31-
import 'package:optimizely_flutter_sdk/src/logger/logger_bridge.dart';
3230

3331
enum ListenerType { activate, track, decision, logEvent, projectConfigUpdate }
3432

0 commit comments

Comments
 (0)