Merge pull request #238 from NIFCLOUD-mbaas/develop

Release v4.0.1

.github/workflows/android.yml

@@ -0,0 +1,18 @@
+name: Android
+
+on: [push, pull_request]
+
+jobs:
+  build_and_test:
+
+    runs-on: macOS-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+
+    - name: build and test
+      run: cd ncmb-core && ./gradlew build test --continue --info

Readme.md

@@ -36,7 +36,7 @@ Gradle projectsタブの `ncmb-core > Tasks > other > makejar` を実行する
 ## 動作環境
 
 本SDKは、Android 7.x ～ 11.x, Android Studio 4.x にて動作確認を行っております。
-(※2021年1月時点)
+(※2021年4月時点)
 
 ## テクニカルサポート窓口対応バージョン
 
@@ -45,7 +45,7 @@ Gradle projectsタブの `ncmb-core > Tasks > other > makejar` を実行する
 ※なお、mobile backend にて大規模な改修が行われた際は、1年半以内のSDKであっても対応出来ない場合がございます。<br>
 その際は[informationブログ](https://mbaas.nifcloud.com/info/)にてお知らせいたします。予めご了承ください。
 
-- v3.0.3 ～ (※2021年1月時点)
+- v3.0.4 ～ (※2021年4月時点)
 
 ## インストール
 
@@ -105,6 +105,7 @@ obj.saveInBackground(new DoneCallback() {
 
 ## 参考URL集
 
-- [ニフクラ mobile backend](https://mbaas.nifcloud.com)
-- [ドキュメント](https://mbaas.nifcloud.com/doc/current)
+- [ニフクラ mobile backend](https://mbaas.nifcloud.com/)
+- [SDKの詳細な使い方](https://mbaas.nifcloud.com/doc/current/)
+- [サンプル＆チュートリアル](https://mbaas.nifcloud.com/doc/current/tutorial/tutorial_android.html)
 - [ユーザーコミュニティ](https://github.com/NIFCLOUD-mbaas/UserCommunity)

ncmb-core/src/main/java/com/nifcloud/mbaas/core/NCMB.java

@@ -30,7 +30,7 @@ public class NCMB {
     /**
      * Version of this SDK
      */
-    public static final String SDK_VERSION = "4.0.0";
+    public static final String SDK_VERSION = "4.0.1";
 
     /**
      * Prefix of keys in metadata for NCMB settings

ncmb-core/src/main/java/com/nifcloud/mbaas/core/NCMBInstallationUtils.java

@@ -67,6 +67,8 @@ public void done(NCMBException saveErr) {
                                 } else if (NCMBException.DATA_NOT_FOUND.equals(saveErr.getCode())) {
                                     //保存失敗 : 端末情報の該当データがない
                                     reRegistInstallation(installation);
+                                } else {
+                                    DeviceTokenCallbackQueue.getInstance().execQueue(token,saveErr);
                                 }
                             }
                         });
@@ -112,20 +114,22 @@ private static void updateInstallation(final NCMBInstallation installation) {
             @Override
             public void done(List<NCMBInstallation> results, NCMBException e) {
 
-                //検索された端末情報のobjectIdを設定
-                try {
-                    installation.setObjectId(results.get(0).getObjectId());
-                } catch (NCMBException searchErr) {
+                if (results.size() > 0) {
+                    //検索された端末情報のobjectIdを設定
+                    try {
+                        installation.setObjectId(results.get(0).getObjectId());
+                    } catch (NCMBException searchErr) {
 
-                }
-
-                //端末情報を更新する
-                installation.saveInBackground(new DoneCallback() {
-                    @Override
-                    public void done(NCMBException e) {
-                        DeviceTokenCallbackQueue.getInstance().execQueue(installation.getLocalDeviceToken(),null);
                     }
-                });
+
+                    //端末情報を更新する
+                    installation.saveInBackground(new DoneCallback() {
+                        @Override
+                        public void done(NCMBException e) {
+                            DeviceTokenCallbackQueue.getInstance().execQueue(installation.getLocalDeviceToken(), null);
+                        }
+                    });
+                }
             }
         });
     }

ncmb-core/src/test/assets/json/valid_get_installation_response.json

@@ -1 +1 @@
-{"objectId":"7FrmPTBKSNtVjajm","createDate":"2014-06-03T11:28:30.348Z","updateDate":"2014-06-03T11:28:30.348Z","acl":{},"sdkVersion":"4.0.0","timeZone":"Asia/Tokyo","deviceType":"android","deviceType":"android","badge":0,"applicationName":"ncmb-core","appVersion":"1.0","deviceToken":"xxxxxxxxxxxxxxxxxxx","channels":["Ch1"],"key":"value","pushType":"fcm"}
+{"objectId":"7FrmPTBKSNtVjajm","createDate":"2014-06-03T11:28:30.348Z","updateDate":"2014-06-03T11:28:30.348Z","acl":{},"sdkVersion":"4.0.1","timeZone":"Asia/Tokyo","deviceType":"android","deviceType":"android","badge":0,"applicationName":"ncmb-core","appVersion":"1.0","deviceToken":"xxxxxxxxxxxxxxxxxxx","channels":["Ch1"],"key":"value","pushType":"fcm"}

ncmb-core/src/test/assets/json/valid_get_searchInstallation_response.json

@@ -10,7 +10,7 @@
       "channels": [],
       "timeZone": "Asia\/Tokyo",
       "applicationName": "UnitTestApp",
-      "sdkVersion": "4.0.0",
+      "sdkVersion": "4.0.1",
       "deviceToken": "dummyDeviceToken01",
       "acl": {
         "*": {
@@ -29,7 +29,7 @@
       "channels": [],
       "timeZone": "Asia\/Tokyo",
       "applicationName": "UnitTestApp",
-      "sdkVersion": "4.0.0",
+      "sdkVersion": "4.0.1",
       "deviceToken": "dummyDeviceToken02",
       "acl": {
         "*": {

ncmb-core/src/test/assets/yaml/mbaas.yml

@@ -133,7 +133,7 @@
       deviceType: "android"
       applicationName: "ncmb-core"
       appVersion: "1.0"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       timeZone: "Asia/Tokyo"
       pushType: "fcm"
   response:
@@ -148,7 +148,7 @@
       deviceType: "android"
       applicationName: "ncmb-core"
       appVersion: "1.0"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       timeZone: "Etc/UTC"
       key: "value"
       pushType: "fcm"
@@ -164,7 +164,7 @@
       deviceType: "android"
       applicationName: "ncmb-core"
       appVersion: "1.0"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       timeZone: "UTC"
       key: "value"
       pushType: "fcm"
@@ -181,7 +181,7 @@
       deviceType: "android"
       applicationName: "ncmb-core"
       appVersion: "1.0"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       timeZone: "Asia/Tokyo"
       pushType: "fcm"
   response:
@@ -197,7 +197,7 @@
       deviceType: "android"
       applicationName: "ncmb-core"
       appVersion: "1.0"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       timeZone: "Etc/UTC"
       pushType: "fcm"
   response:
@@ -213,7 +213,7 @@
       deviceType: "android"
       applicationName: "ncmb-core"
       appVersion: "1.0"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       timeZone: "UTC"
       pushType: "fcm"
   response:
@@ -241,7 +241,7 @@
       deviceType: "android"
       appVersion: "1.0"
       timeZone: "Asia/Tokyo"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       applicationName: "ncmb-core"
       pushType: "fcm"
   response:
@@ -255,7 +255,7 @@
       deviceType: "android"
       appVersion: "1.0"
       timeZone: "Asia/Tokyo"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       applicationName: "ncmb-core"
       key: "value_update"
       pushType: "fcm"
@@ -270,7 +270,7 @@
       deviceType: "android"
       appVersion: "1.0"
       timeZone: "Etc/UTC"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       applicationName: "ncmb-core"
       pushType: "fcm"
   response:
@@ -284,7 +284,7 @@
       deviceType: "android"
       appVersion: "1.0"
       timeZone: "UTC"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       applicationName: "ncmb-core"
       pushType: "fcm"
   response:
@@ -298,7 +298,7 @@
       deviceType: "android"
       appVersion: "1.0"
       timeZone: "Etc/UTC"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       applicationName: "ncmb-core"
       key: "value_update"
       pushType: "fcm"
@@ -313,7 +313,7 @@
       deviceType: "android"
       appVersion: "1.0"
       timeZone: "UTC"
-      sdkVersion: "4.0.0"
+      sdkVersion: "4.0.1"
       applicationName: "ncmb-core"
       key: "value_update"
       pushType: "fcm"

ncmb-core/src/test/java/com/nifcloud/mbaas/core/NCMBInstallationServiceTest.java

@@ -736,7 +736,7 @@ public void currentInstallation_v1_From_v2() throws Exception {
         JSONObject updateJson = installationService.updateInstallation(currentInstallation.getObjectId(), null);
         Assert.assertEquals("2014-06-04T11:28:30.348Z", updateJson.getString("updateDate"));
         currentInstallation = NCMBInstallation.getCurrentInstallation();
-        Assert.assertEquals("4.0.0", currentInstallation.getSDKVersion());
+        Assert.assertEquals("4.0.1", currentInstallation.getSDKVersion());
     }
 
     /*