Skip to content

Commit 1c93501

Browse files
himshikhar-amhimshikhar-am
authored
Release v0.0.5
1 parent e3fe620 commit 1c93501

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2196
-462
lines changed

‎PushEngageSDK/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
defaultConfig {
1010
minSdkVersion 16
1111
targetSdkVersion 31
12-
versionCode 4
13-
versionName "0.0.4"
12+
versionCode 5
13+
versionName "0.0.5"
1414
multiDexEnabled true
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎PushEngageSDK/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1111
<uses-permission android:name="android.permission.WAKE_LOCK" />
1212

13-
<application android:requestLegacyExternalStorage="true">
13+
<application
14+
android:requestLegacyExternalStorage="true">
1415
<activity
1516
android:name=".notificationhandling.PENotificationHandlerActivity"
1617
android:noHistory="true"

‎PushEngageSDK/src/main/java/com/pushengage/pushengage/DataWorker/DailySyncDataWorker.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.pushengage.pushengage.RestClient.RestClient;
1212
import com.pushengage.pushengage.helper.PEPrefs;
1313
import com.pushengage.pushengage.model.request.UpdateSubscriberStatusRequest;
14-
import com.pushengage.pushengage.model.response.GenricResponse;
14+
import com.pushengage.pushengage.model.response.NetworkResponse;
1515

1616
import retrofit2.Call;
1717
import retrofit2.Callback;
@@ -28,7 +28,6 @@ public DailySyncDataWorker(@NonNull Context appContext, @NonNull WorkerParameter
2828
@NonNull
2929
@Override
3030
public Result doWork() {
31-
// Log.i(TAG, "Syncing Data with Server");
3231
prefs = new PEPrefs(getApplicationContext());
3332
try {
3433
NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(getApplicationContext());
@@ -44,11 +43,6 @@ public Result doWork() {
4443
}
4544
}
4645
} catch (Throwable e) {
47-
// e.printStackTrace();
48-
// Technically WorkManager will return Result.failure()
49-
// but it's best to be explicit about it.
50-
// Thus if there were errors, we're return FAILURE
51-
// Log.d(TAG, "Error fetching data", e);
5246
return Result.failure();
5347
}
5448
return Result.success();
@@ -58,7 +52,6 @@ public Result doWork() {
5852
@Override
5953
public void onStopped() {
6054
super.onStopped();
61-
// Log.i(TAG, "OnStopped called for this worker");
6255
}
6356

6457
/**
@@ -68,20 +61,20 @@ public void onStopped() {
6861
*/
6962
public void updateSubscriberStatus(UpdateSubscriberStatusRequest updateSubscriberStatusRequest) {
7063
updateSubscriberStatusRequest.setDeviceTokenHash(prefs.getHash());
71-
Call<GenricResponse> updateSubscriberStatusResponseCall = RestClient.getBackendClient(getApplicationContext()).updateSubscriberStatus(updateSubscriberStatusRequest);
72-
updateSubscriberStatusResponseCall.enqueue(new Callback<GenricResponse>() {
64+
Call<NetworkResponse> updateSubscriberStatusResponseCall = RestClient.getBackendClient(getApplicationContext()).updateSubscriberStatus(updateSubscriberStatusRequest);
65+
updateSubscriberStatusResponseCall.enqueue(new Callback<NetworkResponse>() {
7366
@Override
74-
public void onResponse(@NonNull Call<GenricResponse> call, @NonNull Response<GenricResponse> response) {
67+
public void onResponse(@NonNull Call<NetworkResponse> call, @NonNull Response<NetworkResponse> response) {
7568
if (response.isSuccessful()) {
76-
GenricResponse genricResponse = response.body();
69+
NetworkResponse networkResponse = response.body();
7770
prefs.setIsNotificationDisabled(updateSubscriberStatusRequest.getIsUnSubscribed());
7871
} else {
7972
// Log.d(TAG, "API Failure");
8073
}
8174
}
8275

8376
@Override
84-
public void onFailure(@NonNull Call<GenricResponse> call, @NonNull Throwable t) {
77+
public void onFailure(@NonNull Call<NetworkResponse> call, @NonNull Throwable t) {
8578
// Log.d(TAG, "API Failure");
8679
}
8780
});

‎PushEngageSDK/src/main/java/com/pushengage/pushengage/DataWorker/WeeklySyncDataWorker.java

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.res.Resources;
55
import android.os.Build;
66
import android.telephony.TelephonyManager;
7-
import android.util.Log;
87

98
import androidx.annotation.NonNull;
109
import androidx.core.app.NotificationManagerCompat;
@@ -18,7 +17,7 @@
1817
import com.pushengage.pushengage.helper.PEUtilities;
1918
import com.pushengage.pushengage.model.request.UpdateSubscriberRequest;
2019
import com.pushengage.pushengage.model.response.AndroidSyncResponse;
21-
import com.pushengage.pushengage.model.response.GenricResponse;
20+
import com.pushengage.pushengage.model.response.NetworkResponse;
2221

2322
import java.util.Locale;
2423
import java.util.Objects;
@@ -38,15 +37,9 @@ public WeeklySyncDataWorker(@NonNull Context appContext, @NonNull WorkerParamete
3837
@NonNull
3938
@Override
4039
public Result doWork() {
41-
// Log.i(TAG, "Syncing Data with Server");
4240
try {
4341
callAndroidSync();
4442
} catch (Throwable e) {
45-
// e.printStackTrace();
46-
// Technically WorkManager will return Result.failure()
47-
// but it's best to be explicit about it.
48-
// Thus if there were errors, we're return FAILURE
49-
// Log.d(TAG, "Error fetching data", e);
5043
return Result.failure();
5144
}
5245
return Result.success();
@@ -56,7 +49,6 @@ public Result doWork() {
5649
@Override
5750
public void onStopped() {
5851
super.onStopped();
59-
// Log.i(TAG, "OnStopped called for this worker");
6052
}
6153

6254
/**
@@ -65,7 +57,6 @@ public void onStopped() {
6557
public void callAndroidSync() {
6658
if (PEUtilities.checkNetworkConnection(getApplicationContext())) {
6759
prefs = new PEPrefs(getApplicationContext());
68-
// Log.d(TAG, " SiteKey = " + prefs.getSiteKey());
6960
Call<AndroidSyncResponse> addRecordsResponseCall = RestClient.getBackendCdnClient(getApplicationContext()).androidSync(prefs.getSiteKey());
7061
addRecordsResponseCall.enqueue(new Callback<AndroidSyncResponse>() {
7162
@Override
@@ -92,7 +83,6 @@ public void onResponse(@NonNull Call<AndroidSyncResponse> call, @NonNull Respons
9283
callUpdateSubscriberHash();
9384
} else {
9485
prefs.setIsSubscriberDeleted(true);
95-
// Log.d(TAG, "Site Status = " + androidSyncResponse.getData().getSiteStatus());
9686
}
9787
} else {
9888
// Log.d(TAG, "API Failure");
@@ -130,19 +120,19 @@ private void callUpdateSubscriberHash() {
130120
long longVal = areNotificationsEnabled ? 0 : 1;
131121
prefs.setIsNotificationDisabled(longVal);
132122
UpdateSubscriberRequest updateSubscriberRequest = new UpdateSubscriberRequest(prefs.getSiteId(), device, deviceVersion, timeZone, language, screenSize, longVal);
133-
Call<GenricResponse> updateSubscriberDetailsResponseCall = RestClient.getBackendClient(getApplicationContext()).updateSubscriberHash(prefs.getHash(), updateSubscriberRequest, PushEngage.getSdkVersion(), String.valueOf(prefs.getEu()), String.valueOf(prefs.isGeoFetch()));
134-
updateSubscriberDetailsResponseCall.enqueue(new Callback<GenricResponse>() {
123+
Call<NetworkResponse> updateSubscriberDetailsResponseCall = RestClient.getBackendClient(getApplicationContext()).updateSubscriberHash(prefs.getHash(), updateSubscriberRequest, PushEngage.getSdkVersion(), String.valueOf(prefs.getEu()), String.valueOf(prefs.isGeoFetch()));
124+
updateSubscriberDetailsResponseCall.enqueue(new Callback<NetworkResponse>() {
135125
@Override
136-
public void onResponse(@NonNull Call<GenricResponse> call, @NonNull Response<GenricResponse> response) {
126+
public void onResponse(@NonNull Call<NetworkResponse> call, @NonNull Response<NetworkResponse> response) {
137127
if (response.isSuccessful()) {
138-
GenricResponse genricResponse = response.body();
128+
NetworkResponse networkResponse = response.body();
139129
} else {
140130
// Log.d(TAG, "API Failure");
141131
}
142132
}
143133

144134
@Override
145-
public void onFailure(@NonNull Call<GenricResponse> call, @NonNull Throwable t) {
135+
public void onFailure(@NonNull Call<NetworkResponse> call, @NonNull Throwable t) {
146136
// Log.d(TAG, "API Failure");
147137
}
148138
});

0 commit comments

Comments
 (0)