Skip to content

Commit 3655b0d

Browse files
committed
Added proguard rules for observers
1 parent efca831 commit 3655b0d

File tree

6 files changed

+25
-6
lines changed

6 files changed

+25
-6
lines changed

OneSignalSDK/onesignal/consumer-proguard-rules.pro

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,25 @@
88
-keep public interface android.app.OnActivityPausedListener {*;}
99
-keep class com.onesignal.ActivityLifecycleListenerCompat** {*;}
1010

11+
-keep class com.onesignal.OSSubscriptionState {
12+
void changed(com.onesignal.OSPermissionState);
13+
}
14+
15+
-keep class com.onesignal.OSPermissionChangedInternalObserver {
16+
void changed(com.onesignal.OSPermissionState);
17+
}
18+
19+
-keep class com.onesignal.OSSubscriptionChangedInternalObserver {
20+
void changed(com.onesignal.OSSubscriptionState);
21+
}
22+
23+
-keep class ** implements com.onesignal.OSPermissionObserver {
24+
void onOSPermissionChanged(com.onesignal.OSPermissionStateChanges);
25+
}
26+
27+
-keep class ** implements com.onesignal.OSSubscriptionObserver {
28+
void onOSSubscriptionChanged(com.onesignal.OSSubscriptionStateChanges);
29+
}
1130

1231
-keep class com.onesignal.shortcutbadger.impl.AdwHomeBadger { <init>(...); }
1332
-keep class com.onesignal.shortcutbadger.impl.ApexHomeBadger { <init>(...); }

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSObservable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ boolean notifyChange(final StateType state) {
7474
if (strongRefObserver != null) {
7575
try {
7676
Class<?> clazz = strongRefObserver.getClass();
77-
final Method method = clazz.getMethod(methodName, state.getClass());
77+
final Method method = clazz.getDeclaredMethod(methodName, state.getClass());
7878
method.setAccessible(true);
7979
if (fireOnMainThread) {
8080
OSUtils.runOnMainUIThread(

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSPermissionChangedInternalObserver.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
package com.onesignal;
2929

3030
class OSPermissionChangedInternalObserver {
31-
32-
// TODO: Make sure this method doesn't get prograuded out.
33-
public void changed(OSPermissionState state) {
31+
void changed(OSPermissionState state) {
3432
handleInternalChanges(state);
3533
fireChangesToPublicObserver(state);
3634
}

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSPermissionState.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public class OSPermissionState implements Cloneable {
3737
OSObservable<Object, OSPermissionState> observable;
3838

3939
OSPermissionState(boolean asFrom) {
40+
// Java 8 method reference can be used in the future with Android Studio 2.4.0
41+
// OSPermissionChangedInternalObserver::changed
4042
observable = new OSObservable<>("changed", false);
4143

4244
if (asFrom) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSSubscriptionChangedInternalObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
package com.onesignal;
2929

3030
class OSSubscriptionChangedInternalObserver {
31-
// TODO: Make sure this method doesn't get prograuded out.
31+
3232
public void changed(OSSubscriptionState state) {
3333
fireChangesToPublicObserver(state);
3434
}

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSSubscriptionState.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class OSSubscriptionState implements Cloneable {
6060
private String userId;
6161
private String pushToken;
6262

63-
public void changed(OSPermissionState state) {
63+
void changed(OSPermissionState state) {
6464
setAccepted(state.getEnabled());
6565
}
6666

0 commit comments

Comments
 (0)