[TBT][PBAP,Push][NonACR][Added support for 5.x in push and added feature support...

Change-Id: I9bb4374dd93cd07f1a5c94c91248eb2403d960b8
Signed-off-by: nibha.sharma <nibha.sharma@samsung.com>

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index bc9589cd1a78fd2595481cc415f4c9bc2df63ee9..154433129593358aff5f5af2299836211a065753 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
old mode 100644 (file)
new mode 100755 (executable)
index e518664..34373a7
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ

diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index fd84f7db2da7f215c849b5eaca89f40ae40f7e48..c8f9cabca4b697b757526815bbe51044d6d5ffc6 100644 (file)
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -537,7 +537,7 @@ static tbt_info tbtapps[] =
                        .info = "Get All Phonebook vcards from PBAP Server",
                        .result = 0,
                        .required_features_count = 1,
-                       .features_required = {FEATURE_NETWORK_BLUETOOTH}
+                       .features_required = {FEATURE_NETWORK_BLUETOOTH,FEATURE_NETWORK_BLUETOOTH_PHONEBOOK_CLIENT}
 
                },
        #endif

diff --git a/tbtcoreapp/src/view/tbt-push-view.c b/tbtcoreapp/src/view/tbt-push-view.c
index 7b78f73e2bd818b9068f547f6009ce6fb212714f..d648372ce8025d86b45a9dc9d7497e1268300d7c 100644 (file)
--- a/tbtcoreapp/src/view/tbt-push-view.c
+++ b/tbtcoreapp/src/view/tbt-push-view.c
@@ -622,7 +622,25 @@ static char* push_service_get_server_address(char* reg_id)
        } else if (strncmp(reg_id, "06", 2) == 0) {
                server_address =
                                "https://apchina.push.samsungosp.com.cn:8090/spp/pns/api/push";
-       } else {
+       } else if (strncmp(reg_id, "50", 2) == 0) {
+               server_address =
+                               "https://useast.gateway.push.samsungosp.com:8090/spp/pns/api/push";
+       }else if (strncmp(reg_id, "52", 2) == 0) {
+               server_address =
+                               "https://apsoutheast.gateway.push.samsungosp.com:8090/spp/pns/api/push";
+       }else if (strncmp(reg_id, "53", 2) == 0) {
+               server_address =
+                               "https://euwest.gateway.push.samsungosp.com:8090/spp/pns/api/push";
+       }else if (strncmp(reg_id, "54", 2) == 0) {
+               server_address =
+                               "https://apnortheast.gateway.push.samsungosp.com:8090/spp/pns/api/push";
+       }else if (strncmp(reg_id, "55", 2) == 0) {
+               server_address =
+                               "https://apkorea.gateway.push.samsungosp.com:8090/spp/pns/api/push";
+       }else if (strncmp(reg_id, "56", 2) == 0) {
+               server_address =
+                               "https://apchina.gateway.push.samsungosp.com.cn:8090/spp/pns/api/push";
+       }else {
                DBG("REG_ID has a wrong prefix");
        }
        return server_address;