Skip to content

Commit 3da7999

Browse files
TheBuggedYRNHeshamMegid
authored andcommitted
Revert "Support setSdkDebugLogsLevel on Android" (#317)
This reverts commit 170b8d2.
1 parent 9346a06 commit 3da7999

File tree

10 files changed

+19
-32
lines changed

10 files changed

+19
-32
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Fixes APM network logging on Android
77
* Fixes a NullPointerException when overriding a string key that doesn't exist on Android
88
* Removes redundant native logs
9-
* Deprecates Instabug.setDebugEnabled and APM.setLogLevel APIs in favour of Instabug.setSdkDebugLogsLevel, which controls the verbosity of SDK logs on both platforms
109

1110
## 11.5.0 (2022-11-24)
1211

android/src/main/java/com/instabug/flutter/modules/InstabugApi.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,14 @@ public void run() {
247247
);
248248
}
249249

250+
@Override
251+
public void setDebugEnabled(@NonNull Boolean enabled) {
252+
Instabug.setDebugEnabled(enabled);
253+
}
254+
250255
@Override
251256
public void setSdkDebugLogsLevel(@NonNull String level) {
252-
final int sdkLogLevel = ArgsRegistry.sdkLogLevels.get(level);
253-
Instabug.setSdkDebugLogsLevel(sdkLogLevel);
257+
// iOS Only
254258
}
255259

256260
@Override

android/src/main/java/com/instabug/flutter/util/ArgsRegistry.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,4 @@ public T get(Object key) {
201201
put("CustomTextPlaceHolderKey.messagesNotificationAndOthers", Key.CHATS_MULTIPLE_MESSAGE_NOTIFICATION);
202202
put("CustomTextPlaceHolderKey.insufficientContentMessage", Key.COMMENT_FIELD_INSUFFICIENT_CONTENT);
203203
}};
204-
205-
public static final ArgsMap<Integer> sdkLogLevels = new ArgsMap<Integer>() {{
206-
put("IBGSDKDebugLogsLevel.none", com.instabug.library.LogLevel.NONE);
207-
put("IBGSDKDebugLogsLevel.error", com.instabug.library.LogLevel.ERROR);
208-
put("IBGSDKDebugLogsLevel.debug", com.instabug.library.LogLevel.DEBUG);
209-
put("IBGSDKDebugLogsLevel.verbose", com.instabug.library.LogLevel.VERBOSE);
210-
}};
211204
}

android/src/test/java/com/instabug/flutter/InstabugApiTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,14 @@ public void testGetUserAttributes() {
369369
mInstabug.verify(Instabug::getAllUserAttributes);
370370
}
371371

372+
@SuppressWarnings("deprecation")
372373
@Test
373-
public void testSetSdkDebugLogsLevel() {
374-
String level = "IBGSDKDebugLogsLevel.debug";
374+
public void testSetDebugEnabled() {
375+
boolean isEnabled = true;
375376

376-
api.setSdkDebugLogsLevel(level);
377+
api.setDebugEnabled(isEnabled);
377378

378-
mInstabug.verify(() -> Instabug.setSdkDebugLogsLevel(com.instabug.library.LogLevel.DEBUG));
379+
mInstabug.verify(() -> Instabug.setDebugEnabled(isEnabled));
379380
}
380381

381382
@Test

ios/Classes/Modules/InstabugApi.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ - (void)getUserAttributesWithCompletion:(nonnull void (^)(NSDictionary<NSString
141141
completion(Instabug.userAttributes, nil);
142142
}
143143

144+
- (void)setDebugEnabledEnabled:(NSNumber *)enabled error:(FlutterError *_Nullable *_Nonnull)error {
145+
// Android Only
146+
}
147+
144148
- (void)setSdkDebugLogsLevelLevel:(NSString *)level error:(FlutterError *_Nullable *_Nonnull)error {
145149
IBGSDKDebugLogsLevel resolvedLevel = (ArgsRegistry.sdkLogLevels[level]).integerValue;
146150
[Instabug setSdkDebugLogsLevel:resolvedLevel];

lib/src/modules/apm.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ class APM {
3636

3737
/// Sets log Level to determine level of details in a log
3838
/// [logLevel] Enum value to determine the level
39-
@Deprecated(
40-
"Use [Instabug.setSdkDebugLogsLevel] instead. ",
41-
)
4239
static Future<void> setLogLevel(LogLevel logLevel) async {
4340
return _host.setLogLevel(logLevel.toString());
4441
}

lib/src/modules/instabug.dart

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -291,17 +291,9 @@ class Instabug {
291291
/// Android only
292292
/// Enable/disable SDK logs
293293
/// [debugEnabled] desired state of debug mode.
294-
@Deprecated(
295-
"Use [Instabug.setSdkDebugLogsLevel] instead. This will work on both Android and iOS. ",
296-
)
297294
static Future<void> setDebugEnabled(bool debugEnabled) async {
298295
if (IBGBuildInfo.instance.isAndroid) {
299-
if (debugEnabled) {
300-
return _host
301-
.setSdkDebugLogsLevel(IBGSDKDebugLogsLevel.verbose.toString());
302-
} else {
303-
return _host.setSdkDebugLogsLevel(IBGSDKDebugLogsLevel.none.toString());
304-
}
296+
return _host.setDebugEnabled(debugEnabled);
305297
}
306298
}
307299

pigeons/instabug.api.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ abstract class InstabugHostApi {
3939
@async
4040
Map<String, String>? getUserAttributes();
4141

42+
void setDebugEnabled(bool enabled);
4243
void setSdkDebugLogsLevel(String level);
4344

4445
void setReproStepsMode(String mode);

test/apm_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ void main() {
6161
test('[setLogLevel] should call host method', () async {
6262
const level = LogLevel.debug;
6363

64-
// ignore: deprecated_member_use_from_same_package
6564
await APM.setLogLevel(level);
6665

6766
verify(

test/instabug_test.dart

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,17 +270,14 @@ void main() {
270270
).called(1);
271271
});
272272

273-
test('[setDebugEnabled] should call setSdkDebugLogsLevel host method',
274-
() async {
273+
test('[setDebugEnabled] should call host method', () async {
275274
const enabled = true;
276-
const level = IBGSDKDebugLogsLevel.verbose;
277275
when(mBuildInfo.isAndroid).thenReturn(true);
278276

279-
// ignore: deprecated_member_use_from_same_package
280277
await Instabug.setDebugEnabled(enabled);
281278

282279
verify(
283-
mHost.setSdkDebugLogsLevel(level.toString()),
280+
mHost.setDebugEnabled(enabled),
284281
).called(1);
285282
});
286283

0 commit comments

Comments
 (0)