Skip to content

Commit 9235ac3

Browse files
holailusorianhils1411
holailusoria
authored and
nhils1411
committed
release 7.3.0
1 parent 2142df7 commit 9235ac3

File tree

11 files changed

+52
-28
lines changed

11 files changed

+52
-28
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 7.3.0
2+
3+
* Bump Backendless Android SDK version to 7.0.0
4+
15
# 7.2.12
26

37
* Fixed a bug with an issue where the user token would continue to be sent in a custom service request even after logout.

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Follow the steps below to get started with Backendless Flutter SDK:
1919
To use this plugin in your Flutter project, add `backendless_sdk` as a [dependency in your pubspec.yaml file](https://flutter.io/platform-plugins/):
2020
```dart
2121
dependencies:
22-
backendless_sdk: ^7.2.12
22+
backendless_sdk: ^7.3.0
2323
```
2424
#### STEP 2. Import the Backendless SDK:
2525
Add the following import to your Dart code

‎android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ rootProject.allprojects {
2222
apply plugin: 'com.android.library'
2323

2424
android {
25-
compileSdkVersion 31
25+
compileSdkVersion 33
2626

2727
defaultConfig {
28-
minSdkVersion 16
28+
minSdkVersion 27
2929
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3030
}
3131
lintOptions {
@@ -38,5 +38,5 @@ dependencies {
3838
implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
3939
api 'com.google.firebase:firebase-messaging:20.0.0'
4040

41-
api 'com.backendless:backendless:6.3.6'
41+
api 'com.backendless:android-client-sdk:7.0.0-RC3'
4242
}

‎android/src/main/java/com/backendless/backendless_sdk/call_handlers/BackendlessCallHandler.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Context;
44

55
import com.backendless.Backendless;
6-
import com.backendless.HeadersManager;
7-
import com.backendless.HeadersManager.HeadersEnum;
8-
6+
import com.backendless.BackendlessInjector;
7+
import com.backendless.IHeadersManager;
8+
import com.backendless.Invoker;
99
import java.util.HashMap;
1010
import java.util.Hashtable;
1111
import java.util.Map;
@@ -56,6 +56,7 @@ private void initApp(MethodCall call, MethodChannel.Result result) {
5656
Backendless.initApp(context, customDomain);
5757
else
5858
Backendless.initApp(context, applicationId, apiKey);
59+
5960
result.success(null);
6061
}
6162

@@ -70,7 +71,7 @@ private void setUrl(MethodCall call, MethodChannel.Result result) {
7071
}
7172

7273
private void getHeaders(MethodChannel.Result result) {
73-
Hashtable<String, String> headers = HeadersManager.getInstance().getHeaders();
74+
Map<String, String> headers = BackendlessInjector.getInstance().getHeadersManager().getHeaders();
7475
result.success(headers);
7576
}
7677

@@ -86,11 +87,11 @@ private void setHeader(MethodCall call, MethodChannel.Result result) {
8687
if (stringKey != null) {
8788
Map<String, String> headers = new HashMap<>();
8889
headers.put(stringKey, value);
89-
HeadersManager.getInstance().setHeaders(headers);
90+
BackendlessInjector.getInstance().getHeadersManager().setHeaders(headers);
9091
result.success(null);
9192
} else if (enumKeyIndex != null) {
92-
HeadersEnum headersEnum = HeadersEnum.values()[enumKeyIndex];
93-
HeadersManager.getInstance().addHeader(headersEnum, value);
93+
IHeadersManager.HeadersEnum headersEnum = IHeadersManager.HeadersEnum.values()[enumKeyIndex];
94+
BackendlessInjector.getInstance().getHeadersManager().addHeader(headersEnum, value);
9495
result.success(null);
9596
} else {
9697
result.error("Invalid argument", "Key cannot be null", null);
@@ -102,15 +103,14 @@ private void removeHeader(MethodCall call, MethodChannel.Result result) {
102103
String stringKey = call.argument("stringKey");
103104

104105
if (stringKey != null) {
105-
HeadersManager.getInstance().getHeaders().remove(stringKey);
106+
BackendlessInjector.getInstance().getHeadersManager().getHeaders().remove(stringKey);
106107
result.success(null);
107108
} else if (enumKeyIndex != null) {
108-
HeadersEnum headersEnum = HeadersEnum.values()[enumKeyIndex];
109-
HeadersManager.getInstance().removeHeader(headersEnum);
109+
IHeadersManager.HeadersEnum headersEnum= IHeadersManager.HeadersEnum.values()[enumKeyIndex];
110+
BackendlessInjector.getInstance().getHeadersManager().removeHeader(headersEnum);
110111
result.success(null);
111112
} else {
112113
result.error("Invalid argument", "Key cannot be null", null);
113-
114114
}
115115
}
116116
}

‎android/src/main/java/com/backendless/backendless_sdk/call_handlers/CacheCallHandler.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,19 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
4242
}
4343
}
4444

45+
@Deprecated
4546
private void contains(MethodCall call, MethodChannel.Result result) {
4647
String key = call.argument("key");
4748
Backendless.Cache.contains(key, new FlutterCallback<Boolean>(result));
4849
}
4950

51+
@Deprecated
5052
private void delete(MethodCall call, MethodChannel.Result result) {
5153
String key = call.argument("key");
5254
Backendless.Cache.delete(key, new FlutterCallback<>(result));
5355
}
5456

57+
@Deprecated
5558
private void expireAt(MethodCall call, MethodChannel.Result result) {
5659
String key = call.argument("key");
5760
Date date = call.argument("date");
@@ -64,12 +67,14 @@ private void expireAt(MethodCall call, MethodChannel.Result result) {
6467
}
6568
}
6669

70+
@Deprecated
6771
private void expireIn(MethodCall call, MethodChannel.Result result) {
6872
String key = call.argument("key");
6973
Integer seconds = call.argument("seconds");
7074
Backendless.Cache.expireIn(key, seconds, new FlutterCallback<>(result));
7175
}
7276

77+
@Deprecated
7378
private void get(MethodCall call, final MethodChannel.Result result) {
7479
String key = call.argument("key");
7580
// Pass AsyncCallback for compatibility
@@ -86,6 +91,7 @@ public void handleFault(BackendlessFault fault) {
8691
});
8792
}
8893

94+
@Deprecated
8995
private void put(MethodCall call, MethodChannel.Result result) {
9096
String key = call.argument("key");
9197
Object object = call.argument("object");

‎android/src/main/java/com/backendless/backendless_sdk/call_handlers/CountersCallHandler.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.backendless.backendless_sdk.call_handlers;
22

33
import com.backendless.Backendless;
4+
import com.backendless.BackendlessInjector;
45
import com.backendless.async.callback.AsyncCallback;
56
import com.backendless.backendless_sdk.utils.FlutterCallback;
67

@@ -48,42 +49,52 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
4849
result.notImplemented();
4950
}
5051
}
52+
53+
@Deprecated
5154
private void addAndGet(String counterName, MethodCall call, final MethodChannel.Result result) {
5255
Number value = call.argument("value");
5356
Backendless.Counters.addAndGet(counterName, value, new FlutterAtomicCallback(result));
5457
}
5558

59+
@Deprecated
5660
private void compareAndSet(String counterName, MethodCall call, MethodChannel.Result result) {
5761
Number expected = call.argument("expected");
5862
Number updated = call.argument("updated");
5963
Backendless.Counters.compareAndSet(counterName, expected, updated, new FlutterCallback<Boolean>(result));
6064
}
6165

66+
@Deprecated
6267
private void decrementAndGet(String counterName, MethodChannel.Result result) {
6368
Backendless.Counters.decrementAndGet(counterName, new FlutterAtomicCallback(result));
6469
}
6570

71+
@Deprecated
6672
private void get(String counterName, MethodChannel.Result result) {
6773
Backendless.Counters.get(counterName, new FlutterAtomicCallback(result));
6874
}
6975

76+
@Deprecated
7077
private void getAndAdd(String counterName, MethodCall call, MethodChannel.Result result) {
7178
Number value = call.argument("value");
7279
Backendless.Counters.getAndAdd(counterName, value, new FlutterAtomicCallback(result));
7380
}
7481

82+
@Deprecated
7583
private void getAndDecrement(String counterName, MethodChannel.Result result) {
7684
Backendless.Counters.getAndDecrement(counterName, new FlutterAtomicCallback(result));
7785
}
7886

87+
@Deprecated
7988
private void getAndIncrement(String counterName, MethodChannel.Result result) {
8089
Backendless.Counters.getAndIncrement(counterName, new FlutterAtomicCallback(result));
8190
}
8291

92+
@Deprecated
8393
private void incrementAndGet(String counterName, MethodChannel.Result result) {
8494
Backendless.Counters.incrementAndGet(counterName, new FlutterAtomicCallback(result));
8595
}
8696

97+
@Deprecated
8798
private void reset(String counterName, MethodChannel.Result result) {
8899
Backendless.Counters.reset(counterName, new FlutterCallback<>(result));
89100
}

‎android/src/main/java/com/backendless/backendless_sdk/call_handlers/UserServiceCallHandler.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.backendless.backendless_sdk.call_handlers;
22

33
import com.backendless.Backendless;
4+
import com.backendless.BackendlessInjector;
45
import com.backendless.BackendlessUser;
5-
import com.backendless.HeadersManager;
6+
import com.backendless.IHeadersManager;
67
import com.backendless.backendless_sdk.utils.FlutterCallback;
78
import com.backendless.exceptions.ExceptionMessage;
8-
import com.backendless.persistence.local.UserIdStorageFactory;
9-
import com.backendless.persistence.local.UserTokenStorageFactory;
109
import com.backendless.property.UserProperty;
1110
import com.backendless.persistence.DataQueryBuilder;
1211

@@ -104,10 +103,10 @@ private void setCurrentUser(MethodCall call, MethodChannel.Result result) {
104103

105104
if(stayLoggedIn) {
106105
String userId = currentUser.getUserId();
107-
String userToken = HeadersManager.getInstance().getHeader(HeadersManager.HeadersEnum.USER_TOKEN_KEY);
106+
String userToken = BackendlessInjector.getInstance().getHeadersManager().getHeader(IHeadersManager.HeadersEnum.USER_TOKEN_KEY);
108107

109-
UserTokenStorageFactory.instance().getStorage().set(userToken);
110-
UserIdStorageFactory.instance().getStorage().set(userId);
108+
BackendlessInjector.getInstance().getUserTokenStorage().set(userToken);
109+
BackendlessInjector.getInstance().getUserIdStorage().set(userId);
111110
}
112111

113112
result.success(null);
@@ -197,13 +196,13 @@ private void loginAsGuest(MethodCall call, MethodChannel.Result result) {
197196
}
198197

199198
private void getUserToken(MethodChannel.Result result) {
200-
String userToken = HeadersManager.getInstance().getHeader(HeadersManager.HeadersEnum.USER_TOKEN_KEY);
199+
String userToken = BackendlessInjector.getInstance().getHeadersManager().getHeader(IHeadersManager.HeadersEnum.USER_TOKEN_KEY);
201200
result.success(userToken);
202201
}
203202

204203
private void setUserToken(MethodCall call, MethodChannel.Result result) {
205204
String userToken = call.argument("userToken");
206-
HeadersManager.getInstance().addHeader(HeadersManager.HeadersEnum.USER_TOKEN_KEY, userToken);
205+
BackendlessInjector.getInstance().getHeadersManager().addHeader( IHeadersManager.HeadersEnum.USER_TOKEN_KEY, userToken);
207206
result.success(null);
208207
}
209208

‎android/src/main/java/com/backendless/backendless_sdk/common/FlutterBackendlessFCMService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public static void setMethodChannel(MethodChannel methodChannel) {
3333
channel = methodChannel;
3434
}
3535

36+
@Deprecated
3637
public Map<String, Object> bundleToMap(Bundle extras) {
3738
Map<String, Object> map = new HashMap<>();
3839
for (String key : extras.keySet()) {

‎example/android/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626
apply plugin: 'com.google.gms.google-services'
2727

2828
android {
29-
compileSdkVersion 31
30-
buildToolsVersion "31.0.0"
29+
compileSdkVersion 33
30+
buildToolsVersion "33.0.0"
3131

3232
lintOptions {
3333
disable 'InvalidPackage'
@@ -36,8 +36,8 @@ android {
3636
defaultConfig {
3737
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3838
applicationId "com.backendless.backendless_sdk_example"
39-
minSdkVersion 16
40-
targetSdkVersion 31
39+
minSdkVersion 27
40+
targetSdkVersion 33
4141
versionCode flutterVersionCode.toInteger()
4242
versionName flutterVersionName
4343
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

‎example/android/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@
2626
android:name="flutterEmbedding"
2727
android:value="2" />
2828
</application>
29+
30+
<uses-permission android:name="android.permission.INTERNET" />
31+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
2932
</manifest>

0 commit comments

Comments
 (0)