Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorАлександр Зацепин <az@mapswithme.com>2017-09-29 19:00:39 +0300
committerRoman Kuznetsov <r.kuznetsow@gmail.com>2017-10-02 11:39:33 +0300
commit9a72ce8d75f264390ac52b58566304bbaed6122e (patch)
tree82c2fd7d9d13de583836d31b6cf43f4238ac7fc1
parent03686edde3c3feea3e1e6b2b58e0a0d96d2957f3 (diff)
[android] Temporary added test facebook credentials
-rw-r--r--android/res/values/donottranslate.xml8
-rw-r--r--map/user.cpp3
2 files changed, 8 insertions, 3 deletions
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 63ac36eadb..ca32b05fae 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -3,8 +3,12 @@
<string name="shared_user_label" translatable="false">Maps With Me</string>
<!-- FB -->
- <string name="facebook_app_id" translatable="false">185237551520383</string>
- <string name="fb_login_protocol_scheme">fb185237551520383</string>
+ <!-- TODO: uncomment it before release! -->
+ <!-- <string name="facebook_app_id" translatable="false">185237551520383</string>
+ <string name="fb_login_protocol_scheme">fb185237551520383</string>-->
+
+ <string name="facebook_app_id" translatable="false">685770561587515</string>
+ <string name="fb_login_protocol_scheme">fb685770561587515</string>
<!-- App names -->
<string name="facebook" translatable="false">Facebook</string>
diff --git a/map/user.cpp b/map/user.cpp
index 0b8991b2ae..6007bfcb8b 100644
--- a/map/user.cpp
+++ b/map/user.cpp
@@ -20,6 +20,7 @@ namespace
{
std::string const kMapsMeTokenKey = "MapsMeToken";
std::string const kServerUrl = PASSPORT_URL;
+std::string const kAppName = PASSPORT_APP_NAME;
std::string AuthenticationUrl(std::string const & socialToken,
User::SocialTokenType socialTokenType)
@@ -43,7 +44,7 @@ std::string AuthenticationUrl(std::string const & socialToken,
std::ostringstream ss;
ss << kServerUrl << "/register-by-token/" << socialTokenStr
- << "/?access_token=" << UrlEncode(socialToken);
+ << "/?access_token=" << UrlEncode(socialToken) << "&app=" << kAppName;
return ss.str();
}