kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Get rid of Facebook SDK

Browse source 
Signed-off-by: Daniil Popov <int02h@gmail.com>
This commit is contained in:
Daniil Popov 2021-01-19 22:39:01 +02:00 • committed by Roman Tsisyk
parent 6b6bb9b10b
commit 7e3871ba30
56 changed files with 12 additions and 568 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/AndroidManifest.xml
View file

@ -73,10 +73,6 @@
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id"/>
<meta-data
android:name="PW_APPID"
android:value="${PW_APPID}"/>
@ -329,23 +325,6 @@
android:name=".discovery.DiscoveryActivity"
android:parentActivityName=".MwmActivity" />
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"/>
<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="@string/fb_login_protocol_scheme"/>
</intent-filter>
</activity>
<activity
android:name="com.mapswithme.maps.auth.PhoneAuthActivity"
android:configChanges="orientation|screenLayout|screenSize|keyboardHidden"

3
android/build.gradle
View file

@ -57,9 +57,6 @@ dependencies {
implementation 'com.google.firebase:firebase-crashlytics-ndk:17.1.1'
// 3-party
implementation 'com.facebook.android:facebook-android-sdk:5.15.0'
implementation 'com.facebook.android:audience-network-sdk:5.6.1'
implementation 'com.mopub.mediation:facebookaudiencenetwork:5.6.1.0'
implementation 'com.google.code.gson:gson:2.6.1'
implementation 'com.pushwoosh:pushwoosh:5.19.7'
implementation ('com.my.target:mytarget-sdk:5.2.2') {

15
android/jni/com/mapswithme/maps/editor/OsmOAuth.cpp
View file

@ -74,21 +74,6 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeAuthWithWebviewToken(JNIEnv * env
}
}
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetFacebookAuthUrl(JNIEnv * env, jclass clazz)
{
try
{
OsmOAuth::UrlRequestToken const uks = OsmOAuth::ServerAuth().GetFacebookOAuthURL();
return ToStringArray(env, uks);
}
catch (std::exception const & ex)
{
LOG(LWARNING, ("nativeGetFacebookAuthUrl error ", ex.what()));
return nullptr;
}
}
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetGoogleAuthUrl(JNIEnv * env, jclass clazz)
{

1
android/proguard-mwm.txt
View file

@ -10,7 +10,6 @@
# parse
-dontwarn com.squareup.okhttp.**
-dontwarn okio.**
-dontwarn com.facebook.**
# pushwoosh
-keep class com.pushwoosh.** { *; }

6
android/res/drawable/button_ghost_facebook.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_ghost_facebook_background"
android:state_enabled="true"/>
<item android:drawable="@drawable/button_ghost_background_disabled"/>
</selector>

9
android/res/drawable/button_ghost_facebook_background.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/button_small_corner_radius"/>
<solid android:color="@color/button_facebook"/>
<stroke
android:color="@color/divider"
android:width="@dimen/divider_width"/>
</shape>

6
android/res/drawable/button_ghost_facebook_night.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_ghost_facebook_background"
android:state_enabled="true"/>
<item android:drawable="@drawable/button_ghost_background_disabled_night"/>
</selector>

42
android/res/layout/fragment_app_invites_dialog.xml
View file

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_base_plus"
android:contentDescription="@null"
android:src="@drawable/img_smile"/>
<TextView
android:id="@+id/tv__title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/margin_base"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:text="@string/rating_do_like_maps"
android:textAppearance="@style/MwmTextAppearance.Title"
android:textColor="@color/text_light"
android:textStyle="bold"/>
</LinearLayout>
<TextView
android:id="@+id/tv__subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base_plus"
android:layout_marginLeft="@dimen/margin_base_plus"
android:layout_marginRight="@dimen/margin_base_plus"
android:layout_marginTop="@dimen/margin_base"
android:text="@string/share_on_facebook_text"
android:textAppearance="@style/MwmTextAppearance.Body2"/>
</LinearLayout>

19
android/res/layout/fragment_auth_passport_dialog.xml
View file

@ -100,25 +100,6 @@
android:minHeight="@dimen/primary_button_min_height"
android:layout_marginTop="@dimen/margin_base"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/facebook_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?clickableBackground"
android:background="?facebookButtonBackground"
android:textColor="?accentButtonTextColor"
android:drawableStart="@drawable/img_facebook"
android:paddingLeft="@dimen/margin_half_plus"
android:paddingStart="@dimen/margin_half_plus"
android:paddingRight="@dimen/margin_base_plus"
android:paddingEnd="@dimen/margin_base_plus"
android:textAppearance="@style/MwmTextAppearance.Body3.Primary"
android:fontFamily="@string/robotoMedium"
android:text="@string/facebook"
android:gravity="center"
android:minHeight="@dimen/primary_button_min_height"
android:layout_marginTop="@dimen/margin_base"
tools:targetApi="jelly_bean"/>
<TextView
android:id="@+id/phone_button"
android:layout_width="match_parent"

5
android/res/values-ar/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">جاري التنزيل…</string>
<string name="get_it_now">احصل عليه الآن</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">شكرا لاستخدامك OMaps! هل يعجبك التطبيق؟ أخبر أصدقاءك عن التطبيق! سيكون ذلك هو غاية الامتنان بالنسبة لنا.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">ك.ب.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -378,8 +376,6 @@
<!-- Text in menu -->
<string name="maps_me_community">مجتمع OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">أعجبني على الفيسبوك</string>
<!-- Text in menu -->
<string name="follow_on_twitter">تابعونا على تويتر</string>
<!-- Text in menu -->
<string name="contact_us">أتصل بنا</string>
@ -730,7 +726,6 @@
<string name="you_have_edited_your_first_object">لقد قمت بتعديلك الأول!</string>
<string name="thank_you">شكرا لك</string>
<string name="login_with_google">تسجيل الدخول عبر جوجل</string>
<string name="login_with_facebook">تسجيل الدخول عبر فيسبوك</string>
<string name="login_with_openstreetmap">قم بتسجيل الدخول في www.openstreetmap.org</string>
<string name="edit_place">تعديل المكان</string>
<string name="place_name">اسم المكان</string>

5
android/res/values-cs/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Stahování…</string>
<string name="get_it_now">Získat nyní</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Děkujeme, že používáte OMaps! Líbí se Vám tato aplikace? Řekněte o ní svým přátelům! To bude pro nás nejlepší vyjádření vděčnosti.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Kilometry</string>
<!-- Leave Review dialog - Review button -->
@ -374,8 +372,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Komunita OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Lajknout na Facebooku</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Následovat na Twitteru</string>
<!-- Text in menu -->
<string name="contact_us">Kontaktovat nás</string>
@ -726,7 +722,6 @@
<string name="you_have_edited_your_first_object">Editovali jste svůj první objekt!</string>
<string name="thank_you">Děkujeme Vám</string>
<string name="login_with_google">Přihlásit se pomocí účtu Google</string>
<string name="login_with_facebook">Přihlásit se pomocí účtu Facebook</string>
<string name="login_with_openstreetmap">Přihlásit se pomocí účtu www.openstreetmap.org</string>
<string name="edit_place">Upravit místo</string>
<string name="place_name">Název místa</string>

5
android/res/values-da/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Downloader…</string>
<string name="get_it_now">Få det nu</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Tak for at du bruger OMaps! Kan du lide appen? Fortæl dine venner om den! Det vil vi være så glade for.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Kilometre</string>
<!-- Leave Review dialog - Review button -->
@ -376,8 +374,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps Samfund</string>
<!-- Text in menu -->
<string name="like_on_facebook">Synes godt om på Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Følg på Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Kontakt os</string>
@ -728,7 +724,6 @@
<string name="you_have_edited_your_first_object">Du har redigeret dit første objekt!</string>
<string name="thank_you">Mange tak</string>
<string name="login_with_google">Log ind med Google</string>
<string name="login_with_facebook">Log ind med Facebook</string>
<string name="login_with_openstreetmap">Log ind med www.openstreetmap.org</string>
<string name="edit_place">Redigér stedet</string>
<string name="place_name">Navn på sted</string>

5
android/res/values-de/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Wird heruntergeladen…</string>
<string name="get_it_now">Installieren</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Danke, dass Sie OMaps nutzen! Gefällt Ihnen die App? Erzählen Sie Ihren Freunden davon! Das ist der beste Dank für uns.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">kB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -380,8 +378,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps-Gemeinschaft</string>
<!-- Text in menu -->
<string name="like_on_facebook">„Gefällt mir“ auf Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Bei Twitter folgen</string>
<!-- Text in menu -->
<string name="contact_us">Kontaktieren Sie uns</string>
@ -732,7 +728,6 @@
<string name="you_have_edited_your_first_object">Sie haben Ihr erstes Objekt bearbeitet!</string>
<string name="thank_you">Danke</string>
<string name="login_with_google">Mit Google anmelden</string>
<string name="login_with_facebook">Mit Facebook anmelden</string>
<string name="login_with_openstreetmap">Mit www.openstreetmap.org anmelden</string>
<string name="edit_place">Platz bearbeiten</string>
<string name="place_name">Name des Platzes</string>

4
android/res/values-el/strings.xml
View file

@ -17,8 +17,6 @@
<string name="download_has_failed">Η λήψη απέτυχε. Αγγίξτε για να προσπαθήσετε ξανά.</string>
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Λήψη…</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Σας ευχαριστούμε που χρησιμοποιείτε το OMaps! Σας αρέσει η εφαρμογή; Πείτε το στους φίλους σας! Είναι ότι καλύτερο μπορείτε να κάνετε για εμάς.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Χιλιόμετρα</string>
<!-- Leave Review dialog - Review button -->
@ -284,8 +282,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Κοινότητα OMaps\u0020</string>
<!-- Text in menu -->
<string name="like_on_facebook">Κάντε Like στο Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Ακολουθήστε στο Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Επικοινωνήστε μαζί μας</string>

5
android/res/values-es/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Descargando…</string>
<string name="get_it_now">Instalar</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">¡Gracias por utilizar OMaps! ¿Te gusta la aplicación? ¡Habla de la aplicación a tus amigos! Sería la mejor muestra de gratitud para nosotros.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Kilómetros</string>
<!-- Leave Review dialog - Review button -->
@ -366,8 +364,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Comunidad de OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Pulsa \"Me gusta\" en Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Síguenos en Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Contacta con nosotros</string>
@ -718,7 +714,6 @@
<string name="you_have_edited_your_first_object">¡Has editado tu primer objeto!</string>
<string name="thank_you">Gracias</string>
<string name="login_with_google">Iniciar sesión con Google</string>
<string name="login_with_facebook">Iniciar sesión con Facebook</string>
<string name="login_with_openstreetmap">Iniciar sesión con www.openstreetmap.org</string>
<string name="edit_place">Editar el lugar</string>
<string name="place_name">Nombre del lugar</string>

5
android/res/values-fa/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">درحال دانلود</string>
<string name="get_it_now">هم اکنون دریافت کنید</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">ایا از کارکرد این اپلیکیشن رضایت دارید؟ درمورد این اپلیکیشن به دوستانتان بگویید! این بهترین تشکر از ماست.!OMapsباتشکر از شما برای استفاده از</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">کیلوبایت</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -349,8 +347,6 @@
<!-- Text in menu -->
<string name="maps_me_community">انجمن OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">ما را در فیسبوک لایک کنید</string>
<!-- Text in menu -->
<string name="follow_on_twitter">ما را در توییتر دنبال کنید</string>
<!-- Text in menu -->
<string name="contact_us">تماس با ما</string>
@ -694,7 +690,6 @@
<string name="you_have_edited_your_first_object">شما اولین ویرایشتان را انجام دادید!</string>
<string name="thank_you">متشکریم</string>
<string name="login_with_google">ورود با حساب گوگل</string>
<string name="login_with_facebook">ورود با حساب فیسبوک</string>
<string name="login_with_openstreetmap">ورود با حساب www.openstreetmap.org</string>
<string name="edit_place">ویرایش مکان</string>
<string name="place_name">نام مکان</string>

5
android/res/values-fi/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Ladataan…</string>
<string name="get_it_now">Hanki nyt</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Kiitos kun käytät OMaps:tä! Pidätkö sovelluksesta? Kerro kavereillesi siitä! Se on meille paras mahdollinen kiitos.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">Kt</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -366,8 +364,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps -yhteisö</string>
<!-- Text in menu -->
<string name="like_on_facebook">Tykkää meistä Facebookissa</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Seuraa meitä Twitterissä</string>
<!-- Text in menu -->
<string name="contact_us">Ota yhteyttä</string>
@ -718,7 +714,6 @@
<string name="you_have_edited_your_first_object">Olet muokannut ensimmäistä kohdettasi!</string>
<string name="thank_you">Kiitos</string>
<string name="login_with_google">Kirjaudu sisään Google-tunnuksillasi</string>
<string name="login_with_facebook">Kirjaudu sisään Facebook-tunnuksillasi</string>
<string name="login_with_openstreetmap">Kirjaudu sisään osoitteessa www.openstreetmap.org</string>
<string name="edit_place">Muokkaa kohdetta</string>
<string name="place_name">Paikan nimi</string>

5
android/res/values-fr/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Téléchargement…</string>
<string name="get_it_now">Obtenez-la maintenant</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Merci d’avoir utilisé OMaps ! Vous aimez cette application ? Parlez-en à vos amis ! Ce serait la meilleure preuve de gratitude à notre égard.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">ko</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -382,8 +380,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Communauté OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Aimer sur Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Suivre sur Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Contactez-nous</string>
@ -736,7 +732,6 @@
<string name="you_have_edited_your_first_object">Vous avez modifié votre premier objet!</string>
<string name="thank_you">Merci</string>
<string name="login_with_google">Connectez-vous avec Google</string>
<string name="login_with_facebook">Connectez-vous avec Facebook</string>
<string name="login_with_openstreetmap">Connectez-vous sur www.openstreetmap.org</string>
<string name="edit_place">Modifier le lieu</string>
<string name="place_name">Nom du lieu</string>

5
android/res/values-hu/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Letöltés…</string>
<string name="get_it_now">Telepítés most</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Köszönjük, hogy a OMaps-t használja! Kedveli az appot? Akkor számoljon be a barátainak róla. Ez lenne a legnagyobb hála, amit adhat nekünk.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Kilométer</string>
<!-- Leave Review dialog - Review button -->
@ -374,8 +372,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps közösség</string>
<!-- Text in menu -->
<string name="like_on_facebook">Lájkolj minket Facebookon</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Kövess minket Twitteren</string>
<!-- Text in menu -->
<string name="contact_us">Kapcsolat</string>
@ -726,7 +722,6 @@
<string name="you_have_edited_your_first_object">Szerkesztetted az első objektumod!</string>
<string name="thank_you">Köszönjük</string>
<string name="login_with_google">Bejelentkezés Google- vel</string>
<string name="login_with_facebook">Bejelentkezés Facebookkal</string>
<string name="login_with_openstreetmap">Jelentkezz be a www.openstreetmap.org oldalon</string>
<string name="edit_place">Hely szerkesztése</string>
<string name="place_name">Hely neve</string>

5
android/res/values-in/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Sedang mengunduh…</string>
<string name="get_it_now">Dapatkan sekarang</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Terima kasih karena menggunakan OMaps! Apakah Anda suka aplikasi ini? Beri tahukan kepada teman-teman Anda! Ini akan menjadi ungkapan terima kasih yang terbaik bagi kami.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">kB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -366,8 +364,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Komunitas OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Sukai di Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Ikuti di Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Hubungi kami</string>
@ -717,7 +713,6 @@
<string name="you_have_edited_your_first_object">Anda menyunting objek pertama Anda!</string>
<string name="thank_you">Terima kasih</string>
<string name="login_with_google">Masuk menggunakan Google</string>
<string name="login_with_facebook">Masuk menggunakan Facebook</string>
<string name="login_with_openstreetmap">Masuk menggunakan www.openstreetmap.org</string>
<string name="edit_place">Sunting tempat</string>
<string name="place_name">Nama tempat</string>

5
android/res/values-it/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">In fase di download…</string>
<string name="get_it_now">Prendila ora</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Grazie per aver utilizzato OMaps! Ti piace l’app? Dillo ai tuoi amici! Questo è il miglior segno di gratitudine.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Chilometri</string>
<!-- Leave Review dialog - Review button -->
@ -372,8 +370,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Comunità OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Dai Mi Piace su Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Seguici su Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Contattaci</string>
@ -724,7 +720,6 @@
<string name="you_have_edited_your_first_object">Hai modificato il tuo primo oggetto!</string>
<string name="thank_you">Grazie</string>
<string name="login_with_google">Accedi con Google</string>
<string name="login_with_facebook">Accedi con Facebook</string>
<string name="login_with_openstreetmap">Accedi con www.openstreetmap.org</string>
<string name="edit_place">Modifica il luogo</string>
<string name="place_name">Nome del luogo</string>

5
android/res/values-ja/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">ダウンロード中…</string>
<string name="get_it_now">今すぐ入手</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">OMapsをご利用いただきありがとうございます! このアプリが好きですか? お友達にも教えてあげてください! アプリを広めていただければ大変嬉しく思います。</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">キロメートル</string>
<!-- Leave Review dialog - Review button -->
@ -366,8 +364,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMapsコミュニティ</string>
<!-- Text in menu -->
<string name="like_on_facebook">Facebookでいいねをクリック</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Twitterでフォロー</string>
<!-- Text in menu -->
<string name="contact_us">お問い合わせ</string>
@ -718,7 +714,6 @@
<string name="you_have_edited_your_first_object">初めてオブジェクトを編集しました！</string>
<string name="thank_you">ありがとうございます</string>
<string name="login_with_google">Googleでログイン</string>
<string name="login_with_facebook">Facebookでログイン</string>
<string name="login_with_openstreetmap">www.openstreetmap.orgでログインしてください</string>
<string name="edit_place">場所を編集</string>
<string name="place_name">場所の名前</string>

5
android/res/values-ko/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">다운로드 중…</string>
<string name="get_it_now">지금 가져오기</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">OMaps를 사용해 주셔서 감사합니다! 앱을 좋아하십니까? 이 앱에 대해 친구들에게 널리 알려 주십시오! 그러면 저희는 매우 감사할 것입니다.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">킬로미터</string>
<!-- Leave Review dialog - Review button -->
@ -368,8 +366,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps 커뮤니티</string>
<!-- Text in menu -->
<string name="like_on_facebook">Facebook에서 좋아요</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Twitter에서 팔로우</string>
<!-- Text in menu -->
<string name="contact_us">연락처</string>
@ -720,7 +716,6 @@
<string name="you_have_edited_your_first_object">로그인하고 전 세계 수백만 사람들을 위해 변화를 더하십시오!</string>
<string name="thank_you">고맙습니다.</string>
<string name="login_with_google">Google로 로그인</string>
<string name="login_with_facebook">Facebook으로 로그인</string>
<string name="login_with_openstreetmap">www.openstreetmap.org에 로그인</string>
<string name="edit_place">장소 편집</string>
<string name="place_name">지명</string>

5
android/res/values-nb/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Laster ned …</string>
<string name="get_it_now">Hent nå</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Tusen takk for at du bruker OMaps! Liker du appen? Fortell vennene dine om den! Det er den beste takken vi kan få.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">kB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -366,8 +364,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps-samfunnet</string>
<!-- Text in menu -->
<string name="like_on_facebook">Lik på Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Følg på Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Kontakt oss</string>
@ -718,7 +714,6 @@
<string name="you_have_edited_your_first_object">Du har redigert ditt første objekt!</string>
<string name="thank_you">Takk skal du ha</string>
<string name="login_with_google">Logg inn med Google</string>
<string name="login_with_facebook">Logg inn med Facebook</string>
<string name="login_with_openstreetmap">Logg inn med www.openstreetmap.org</string>
<string name="edit_place">Rediger stedet</string>
<string name="place_name">Stedsnavn</string>

5
android/res/values-nl/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Downloaden…</string>
<string name="get_it_now">Installeren</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Bedankt om OMaps te gebruiken! Vindt u de app leuk? Vertel uw vrienden erover! Dit is voor ons het beste dankgebaar.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">KB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -373,8 +371,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Gemeenschap van OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Ons leuk vinden op Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Ons volgen op Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Contact met ons opnemen</string>
@ -725,7 +721,6 @@
<string name="you_have_edited_your_first_object">Je hebt je eerste object aangepast!</string>
<string name="thank_you">Dank je wel</string>
<string name="login_with_google">Aanmelden met Google</string>
<string name="login_with_facebook">Aanmelden met Facebook</string>
<string name="login_with_openstreetmap">Aanmelden met www.openstreetmap.org</string>
<string name="edit_place">De locatie bewerken</string>
<string name="place_name">Locatienaam</string>

5
android/res/values-pl/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Pobieranie…</string>
<string name="get_it_now">Pobierz</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Dziękujemy za korzystanie z OMaps! Czy podoba Ci się nasza aplikacja? Opowiedz o niej swoim znajomym! W taki sposób najlepiej nam podziękujesz.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">KB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -382,8 +380,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Społeczność OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Polub nas na Facebooku</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Sledź nas na Twitterze</string>
<!-- Text in menu -->
<string name="contact_us">Skontaktuj się z nami</string>
@ -734,7 +730,6 @@
<string name="you_have_edited_your_first_object">Edycja Twojego pierwszego obiektu zakończona!</string>
<string name="thank_you">Dziękujemy</string>
<string name="login_with_google">Zaloguj się przez Google</string>
<string name="login_with_facebook">Zaloguj się przez Facebooka</string>
<string name="login_with_openstreetmap">Zaloguj się przez www.openstreetmap.org</string>
<string name="edit_place">Edytuj miejsce</string>
<string name="place_name">Nazwa miejsca</string>

5
android/res/values-pt/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">A descarregar…</string>
<string name="get_it_now">Instale agora</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Obrigado por usar OMaps! Gosta do aplicativo? Conte para seus amigos! Será a melhor forma de nos agradecer.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Quilómetros</string>
<!-- Leave Review dialog - Review button -->
@ -374,8 +372,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Comunidade OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Gostar no Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Seguir no Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Contacte-nos</string>
@ -728,7 +724,6 @@
<string name="you_have_edited_your_first_object">Você editou o seu primeiro objeto!</string>
<string name="thank_you">Obrigado</string>
<string name="login_with_google">Entrar com Google</string>
<string name="login_with_facebook">Entrar com Facebook</string>
<string name="login_with_openstreetmap">Entrar com www.openstreetmap.org</string>
<string name="edit_place">Editar o local</string>
<string name="place_name">Nome do local</string>

5
android/res/values-ro/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Se descarcă…</string>
<string name="get_it_now">Obțineți acum</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Vă mulțumim că folosiți OMaps! Vă place aplicația? Spuneți-le prietenilor despre ea! Aceasta va fi cea mai mare mulțumire pentru noi.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">kB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -364,8 +362,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Comunitatea OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Apreciați-ne pe Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Urmăriți-ne pe Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Contactați-ne</string>
@ -715,7 +711,6 @@
<string name="you_have_edited_your_first_object">Ați editat primul dvs. obiect!</string>
<string name="thank_you">Vă mulțumim</string>
<string name="login_with_google">Logați-vă cu contul de Google</string>
<string name="login_with_facebook">Logați-vă cu contul de Facebook</string>
<string name="login_with_openstreetmap">Logați-vă cu contul de www.openstreetmap.org</string>
<string name="edit_place">Editați loc</string>
<string name="place_name">Denumire loc</string>

5
android/res/values-ru/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Загружается…</string>
<string name="get_it_now">Установить</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Спасибо, что пользуетесь OMaps! Нравится приложение? Расскажите о нём своим друзьям. Это будет лучшей благодарностью для нас.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">кБ</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -386,8 +384,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Сообщество OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">OMaps в Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">OMaps в Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Свяжитесь с нами</string>
@ -738,7 +734,6 @@
<string name="you_have_edited_your_first_object">Вы отредактировали свой первый объект!</string>
<string name="thank_you">Спасибо</string>
<string name="login_with_google">Войти через Google</string>
<string name="login_with_facebook">Войти через Facebook</string>
<string name="login_with_openstreetmap">Войти через www.openstreetmap.org</string>
<string name="edit_place">Редактировать место</string>
<string name="place_name">Название</string>

5
android/res/values-sk/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Sťahovanie…</string>
<string name="get_it_now">Získať teraz</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Ďakujeme, že používate OMaps! Páči sa vám táto aplikácia? Povedzte o nej svojim priateľom! Bude to pre nás najlepšia odmena.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Kilometre</string>
<!-- Leave Review dialog - Review button -->
@ -372,8 +370,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Komunita OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Označiť pomocou Páči sa mi to na Facebooku</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Sledovať na Twitteri</string>
<!-- Text in menu -->
<string name="contact_us">Kontaktovať nás</string>
@ -722,7 +718,6 @@
<string name="you_have_edited_your_first_object">Upravili ste svoj prvý objekt!</string>
<string name="thank_you">Ďakujeme Vám</string>
<string name="login_with_google">Prihlásiť sa cez Google</string>
<string name="login_with_facebook">Prihlásiť sa cez Facebook</string>
<string name="login_with_openstreetmap">Prihlásiť sa cez www.openstreetmap.org</string>
<string name="edit_place">Upraviť miesto</string>
<string name="place_name">Názov miesta</string>

5
android/res/values-sv/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Laddar ner…</string>
<string name="get_it_now">Skaffa det nu</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Tack för att du använder OMaps! Gillar du appen? Berätta för dina vänner om den! Det skulle vara höjden av tacksamhet för oss.</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">Kilometer</string>
<!-- Leave Review dialog - Review button -->
@ -374,8 +372,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps Gemenskap</string>
<!-- Text in menu -->
<string name="like_on_facebook">Gilla på Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Följ på Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Kontakta oss</string>
@ -724,7 +720,6 @@
<string name="you_have_edited_your_first_object">Du har redigerat ditt första objekt!</string>
<string name="thank_you">Tack</string>
<string name="login_with_google">Logga in med Google</string>
<string name="login_with_facebook">Logga in med Facebook</string>
<string name="login_with_openstreetmap">Logga in med www.openstreetmap.org</string>
<string name="edit_place">Ändra platsen</string>
<string name="place_name">Platsens namn</string>

5
android/res/values-th/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">กำลังดาวน์โหลด…</string>
<string name="get_it_now">รับมันตอนนี้</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">ขอบพระคุณสำหรับการใช้ OMaps! คุณชอบแอปหรือไม่? บอกเพื่อนของคุณเกี่ยวกับมัน! นี่จะเป็นการขอบคุณที่ดีที่สุดสำหรับเรา</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">กิโลไบต์</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -378,8 +376,6 @@
<!-- Text in menu -->
<string name="maps_me_community">ชุมชน OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">ถูกใจบน Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">ติดตามบน Twitter</string>
<!-- Text in menu -->
<string name="contact_us">ติดต่อเรา</string>
@ -730,7 +726,6 @@
<string name="you_have_edited_your_first_object">คุณได้แก้ไขวัตถุแรกของคุณ!</string>
<string name="thank_you">ขอบพระคุณ</string>
<string name="login_with_google">ล็อกอินด้วย Google</string>
<string name="login_with_facebook">ล็อกอินด้วย Facebook</string>
<string name="login_with_openstreetmap">ล็อกอินที่ www.openstreetmap.org</string>
<string name="edit_place">แก้ไขสถานที่</string>
<string name="place_name">ชื่อสถานที่</string>

5
android/res/values-tr/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">İndiriliyor…</string>
<string name="get_it_now">Hemen al</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">OMaps’yi kullandığınız için teşekkür ederiz! Uygulamayı beğendiniz mi? Bundan arkadaşlarınıza bahsedin! Bundan büyük memnuniyet duyarız.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">kB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -378,8 +376,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps Topluluğu</string>
<!-- Text in menu -->
<string name="like_on_facebook">Facebook\'da beğen</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Twitter\'da takip et</string>
<!-- Text in menu -->
<string name="contact_us">İletişim</string>
@ -730,7 +726,6 @@
<string name="you_have_edited_your_first_object">İlk nesneni düzenledin!</string>
<string name="thank_you">Teşekkür ederiz</string>
<string name="login_with_google">Google ile giriş</string>
<string name="login_with_facebook">Facebook ile giriş</string>
<string name="login_with_openstreetmap">www.openstreetmap.org adresinden oturum aç</string>
<string name="edit_place">Yeri düzenle</string>
<string name="place_name">Yer ismi</string>

5
android/res/values-uk/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Завантажується…</string>
<string name="get_it_now">Встановити</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Дякуємо за використання OMaps! Чи подобається вам ця програма? Розкажіть своїм друзям про неї! Це буде найкраща подяка для нас.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">кБ</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -377,8 +375,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Спільнота OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">OMaps у Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">OMaps у Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Контакти</string>
@ -729,7 +725,6 @@
<string name="you_have_edited_your_first_object">Ви редагували свій перший об\'єкт!</string>
<string name="thank_you">Дякуємо</string>
<string name="login_with_google">Увійти за допомогою Google</string>
<string name="login_with_facebook">Увійти за допомогою Facebook</string>
<string name="login_with_openstreetmap">Увійти за допомогою www.openstreetmap.org</string>
<string name="edit_place">Редагувати місце</string>
<string name="place_name">Назва</string>

5
android/res/values-vi/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Đang tải xuống…</string>
<string name="get_it_now">Tải xuống ngay</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Cám ơn bạn đã sử dụng OMaps! Bạn thích ứng dụng chứ? Kể cho bạn bè về ứng dụng này! Đây sẽ là sự biết ơn tuyệt vời nhất đối với chúng tôi.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">kB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -366,8 +364,6 @@
<!-- Text in menu -->
<string name="maps_me_community">Cộng đồng OMaps</string>
<!-- Text in menu -->
<string name="like_on_facebook">Thích trên Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Theo dõi trên Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Liên hệ với chúng tôi</string>
@ -718,7 +714,6 @@
<string name="you_have_edited_your_first_object">Bạn đã chỉnh sửa đối tượng đầu tiên của mình!</string>
<string name="thank_you">Cảm ơn bạn</string>
<string name="login_with_google">Đăng nhập với Google</string>
<string name="login_with_facebook">Đăng nhập với Facebook</string>
<string name="login_with_openstreetmap">Đăng nhập với www.openstreetmap.org</string>
<string name="edit_place">Chỉnh sửa địa điểm</string>
<string name="place_name">Tên địa điểm</string>

5
android/res/values-zh-rTW/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">下載中…</string>
<string name="get_it_now">馬上取得</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">感謝您使用 OMaps！您喜歡此應用程式嗎？告訴好友們吧！這會是對我們最好的感謝。</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">公里</string>
<!-- Leave Review dialog - Review button -->
@ -376,8 +374,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps 社群</string>
<!-- Text in menu -->
<string name="like_on_facebook">在 Facebook 上按讚</string>
<!-- Text in menu -->
<string name="follow_on_twitter">在Twitter 上關注</string>
<!-- Text in menu -->
<string name="contact_us">聯絡我們</string>
@ -728,7 +724,6 @@
<string name="you_have_edited_your_first_object">您已編輯您的第一個物件！</string>
<string name="thank_you">謝謝您</string>
<string name="login_with_google">用 Google 登入</string>
<string name="login_with_facebook">用 Facebook 登入</string>
<string name="login_with_openstreetmap">登入到 www.openstreetmap.org</string>
<string name="edit_place">編輯地點</string>
<string name="place_name">地點名稱</string>

5
android/res/values-zh/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">下载…</string>
<string name="get_it_now">现在就获取它</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">感谢您使用 OMaps！您喜欢此应用吗？告诉您的好友们吧！这会是对我们最好的感谢。</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
<string name="kilometres">千米</string>
<!-- Leave Review dialog - Review button -->
@ -374,8 +372,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps社区</string>
<!-- Text in menu -->
<string name="like_on_facebook">在Facebook 上点赞</string>
<!-- Text in menu -->
<string name="follow_on_twitter">在Twitter 上关注</string>
<!-- Text in menu -->
<string name="contact_us">联系我们</string>
@ -724,7 +720,6 @@
<string name="you_have_edited_your_first_object">您已编辑您的第一件物品！</string>
<string name="thank_you">谢谢您</string>
<string name="login_with_google">用谷歌登陆</string>
<string name="login_with_facebook">用脸书登陆</string>
<string name="login_with_openstreetmap">登录到www.openstreetmap.org</string>
<string name="edit_place">编辑地点</string>
<string name="place_name">地点名</string>

1
android/res/values/colors.xml
View file

@ -136,7 +136,6 @@
<color name="button_red_disabled">#FFB9332B</color>
<color name="button_red_text">#FFFFFFFF</color>
<color name="button_red_text_disabled">#FF606060</color>
<color name="button_facebook">#FF3B5998</color>
<color name="downloader_gray">#FF999999</color>

7
android/res/values/donottranslate.xml
View file

@ -2,13 +2,6 @@
<resources>
<string name="shared_user_label" translatable="false">OMaps</string>
<!-- Dev facebook credentials
<string name="facebook_app_id" translatable="false">462405334160274</string>
<string name="fb_login_protocol_scheme">fb462405334160274</string> -->
<string name="facebook_app_id" translatable="false">185237551520383</string>
<string name="fb_login_protocol_scheme">fb185237551520383</string>
<!-- App names -->
<string name="facebook" translatable="false">Facebook</string>
<string name="twitter" translatable="false">Twitter</string>

5
android/res/values/strings.xml
View file

@ -30,8 +30,6 @@
<!-- Settings/Downloader - info for country which started downloading -->
<string name="downloading">Downloading…</string>
<string name="get_it_now">Get it now</string>
<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
<string name="share_on_facebook_text">Thank you for using OMaps! Do you like the app? Tell your friends about it! This is the best thanks you could give us.</string>
<!-- Settings/Downloader - size string, only strings different from English should be translated -->
<string name="kb">kB</string>
<!-- Choose measurement on first launch alert - choose metric system button -->
@ -387,8 +385,6 @@
<!-- Text in menu -->
<string name="maps_me_community">OMaps Community</string>
<!-- Text in menu -->
<string name="like_on_facebook">Like on Facebook</string>
<!-- Text in menu -->
<string name="follow_on_twitter">Follow on Twitter</string>
<!-- Text in menu -->
<string name="contact_us">Contact us</string>
@ -741,7 +737,6 @@
<string name="you_have_edited_your_first_object">You’ve edited your first object!</string>
<string name="thank_you">Thank You</string>
<string name="login_with_google">Login with Google</string>
<string name="login_with_facebook">Login with Facebook</string>
<string name="login_with_openstreetmap">Log in with www.openstreetmap.org</string>
<string name="edit_place">Edit Place</string>
<string name="place_name">Place Name</string>

1
android/res/values/themes-attrs.xml
View file

@ -35,7 +35,6 @@
<attr name="accentButtonTextColorDisabled" format="color" />
<attr name="ghostButtonBackground" format="reference" />
<attr name="ghostButtonTextColor" format="color" />
<attr name="facebookButtonBackground" format="reference" />
<attr name="redButtonBackground" format="reference" />
<attr name="redButtonTextColor" format="color" />
<attr name="redButtonTextColorDisabled" format="color" />

2
android/res/values/themes-base.xml
View file

@ -59,7 +59,6 @@
<item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled</item>
<item name="ghostButtonBackground">@drawable/button_ghost</item>
<item name="ghostButtonTextColor">@color/button_text_ghost</item>
<item name="facebookButtonBackground">@drawable/button_ghost_facebook</item>
<item name="redButtonBackground">@drawable/button_red</item>
<item name="redButtonTextColor">@color/button_red_text</item>
@ -274,7 +273,6 @@
<item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
<item name="ghostButtonBackground">@drawable/button_ghost_night</item>
<item name="ghostButtonTextColor">@color/button_text_ghost_night</item>
<item name="facebookButtonBackground">@drawable/button_ghost_facebook_night</item>
<item name="redButtonBackground">@drawable/button_red</item>
<item name="redButtonTextColor">@color/button_red_text</item>

3
android/src/com/mapswithme/maps/Framework.java
View file

@ -87,12 +87,11 @@ public class Framework
public static final int ROUTE_REBUILD_AFTER_POINTS_LOADING = 0;
@Retention(RetentionPolicy.SOURCE)
@IntDef({ SOCIAL_TOKEN_INVALID, SOCIAL_TOKEN_FACEBOOK, SOCIAL_TOKEN_GOOGLE,
@IntDef({ SOCIAL_TOKEN_INVALID, SOCIAL_TOKEN_GOOGLE,
SOCIAL_TOKEN_PHONE, TOKEN_MAPSME })
public @interface AuthTokenType
{}
public static final int SOCIAL_TOKEN_INVALID = -1;
public static final int SOCIAL_TOKEN_FACEBOOK = 0;
public static final int SOCIAL_TOKEN_GOOGLE = 1;
public static final int SOCIAL_TOKEN_PHONE = 2;
//TODO(@alexzatsepin): remove TOKEN_MAPSME from this list.

4
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -1489,10 +1489,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
LikesManager.INSTANCE.showRateDialogForOldUser(this);
Counters.setShowReviewForOldUser(context, false);
}
else
{
LikesManager.INSTANCE.showDialogs(this);
}
}
@Override

3
android/src/com/mapswithme/maps/ads/Banner.java
View file

@ -48,8 +48,6 @@ public final class Banner implements Parcelable
{
switch (Type.values()[mType])
{
case TYPE_FACEBOOK:
return Providers.FACEBOOK;
case TYPE_RB:
return Providers.MY_TARGET;
case TYPE_MOPUB:
@ -111,7 +109,6 @@ public final class Banner implements Parcelable
public enum Type
{
TYPE_NONE,
TYPE_FACEBOOK,
TYPE_RB,
TYPE_MOPUB,
TYPE_GOOGLE

85
android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java
View file

@ -1,85 +0,0 @@
package com.mapswithme.maps.ads;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import com.facebook.FacebookSdk;
import com.facebook.share.model.AppInviteContent;
import com.facebook.share.widget.AppInviteDialog;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmDialogFragment;
import com.mapswithme.maps.dialog.DialogUtils;
import com.mapswithme.util.statistics.Statistics;
public class FacebookInvitesDialogFragment extends BaseMwmDialogFragment
{
private static final String INVITE_APP_URL = "https://fb.me/958251974218933";
private static final String INVITE_IMAGE = "https://omaps.app/images/fb_app_invite_banner.png";
private boolean mHasInvited;
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState)
{
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
final LayoutInflater inflater = getActivity().getLayoutInflater();
final View root = inflater.inflate(R.layout.fragment_app_invites_dialog, null);
return builder.setView(root)
.setNegativeButton(R.string.remind_me_later, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
Statistics.INSTANCE.trackEvent(Statistics.EventName.FACEBOOK_INVITE_LATER);
}
})
.setPositiveButton(R.string.share, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
mHasInvited = true;
showAppInviteDialog();
Statistics.INSTANCE.trackEvent(Statistics.EventName.FACEBOOK_INVITE_INVITED);
}
}).create();
}
@Override
public void onResume()
{
super.onResume();
if (mHasInvited)
dismiss();
}
@Override
public void onCancel(DialogInterface dialog)
{
super.onCancel(dialog);
Statistics.INSTANCE.trackEvent(Statistics.EventName.FACEBOOK_INVITE_LATER);
}
private void showAppInviteDialog()
{
FacebookSdk.sdkInitialize(getActivity());
AppInviteContent content = new AppInviteContent.Builder()
.setApplinkUrl(INVITE_APP_URL)
.setPreviewImageUrl(INVITE_IMAGE)
.build();
if (AppInviteDialog.canShow())
AppInviteDialog.show(this, content);
else
{
DialogUtils.showAlertDialog(getActivity(), R.string.email_error_title);
dismiss();
}
}
}

35
android/src/com/mapswithme/maps/ads/LikesManager.java
View file

@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import android.content.Context;
import android.util.SparseArray;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.MwmActivity;
@ -15,7 +14,6 @@ import com.mapswithme.maps.downloader.MapManager;
import com.mapswithme.maps.editor.EditorHostFragment;
import com.mapswithme.maps.routing.RoutingController;
import com.mapswithme.maps.search.SearchFragment;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.Counters;
import com.mapswithme.util.concurrency.UiThread;
@ -29,7 +27,6 @@ public enum LikesManager
private static final int DIALOG_DELAY_DEFAULT = 30000;
private static final int DIALOG_DELAY_SHORT = 5000;
/*
Maps type of like dialog to the dialog, performing like.
@ -37,9 +34,7 @@ public enum LikesManager
public enum LikeType
{
GPLAY_NEW_USERS(RateStoreDialogFragment.class, DIALOG_DELAY_DEFAULT),
GPLAY_OLD_USERS(RateStoreDialogFragment.class, DIALOG_DELAY_DEFAULT),
FACEBOOK_INVITE_NEW_USERS(FacebookInvitesDialogFragment.class, DIALOG_DELAY_DEFAULT),
FACEBOOK_INVITES_OLD_USERS(FacebookInvitesDialogFragment.class, DIALOG_DELAY_DEFAULT);
GPLAY_OLD_USERS(RateStoreDialogFragment.class, DIALOG_DELAY_DEFAULT);
public final Class<? extends DialogFragment> clazz;
public final int delay;
@ -51,23 +46,10 @@ public enum LikesManager
}
}
/*
Maps number of session to LikeType.
*/
private static final SparseArray<LikeType> sOldUsersMapping = new SparseArray<>();
private static final SparseArray<LikeType> sNewUsersMapping = new SparseArray<>();
private static final List<Class<? extends Fragment>> sFragments = new ArrayList<>();
static
{
sOldUsersMapping.put(6, LikeType.FACEBOOK_INVITES_OLD_USERS);
sOldUsersMapping.put(30, LikeType.FACEBOOK_INVITES_OLD_USERS);
sOldUsersMapping.put(50, LikeType.FACEBOOK_INVITES_OLD_USERS);
sNewUsersMapping.put(9, LikeType.FACEBOOK_INVITE_NEW_USERS);
sNewUsersMapping.put(35, LikeType.FACEBOOK_INVITE_NEW_USERS);
sNewUsersMapping.put(55, LikeType.FACEBOOK_INVITE_NEW_USERS);
sFragments.add(SearchFragment.class);
sFragments.add(EditorHostFragment.class);
sFragments.add(DownloaderFragment.class);
@ -81,21 +63,6 @@ public enum LikesManager
return (Counters.getFirstInstallVersion(context) == BuildConfig.VERSION_CODE);
}
public void showDialogs(FragmentActivity activity)
{
mActivityRef = new WeakReference<>(activity);
if (!ConnectionState.INSTANCE.isConnected())
return;
Context context = activity.getApplicationContext();
int sessionCount = Counters.getSessionCount(context);
final LikeType type = isNewUser(context) ?
sNewUsersMapping.get(sessionCount) : sOldUsersMapping.get(sessionCount);
if (type != null)
displayLikeDialog(context, type.clazz, type.delay);
}
public void showRateDialogForOldUser(FragmentActivity activity)
{
Context context = activity.getApplicationContext();

1
android/src/com/mapswithme/maps/ads/NetworkType.java
View file

@ -2,7 +2,6 @@ package com.mapswithme.maps.ads;
public enum NetworkType
{
FACEBOOK,
GOOGLE,
MOPUB,
MOPUB_GOOGLE,

1
android/src/com/mapswithme/maps/ads/Providers.java
View file

@ -3,7 +3,6 @@ package com.mapswithme.maps.ads;
class Providers
{
static final String FACEBOOK = "FB";
static final String MY_TARGET = "MY_TARGET";
static final String MOPUB = "MOPUB";
static final String GOOGLE = "GOOGLE";

5
android/src/com/mapswithme/maps/auth/Constants.java
View file

@ -1,8 +1,5 @@
package com.mapswithme.maps.auth;
import java.util.Collections;
import java.util.List;
class Constants
{
static final int REQ_CODE_PHONE_AUTH_RESULT = 102;
@ -15,6 +12,4 @@ class Constants
static final String EXTRA_PRIVACY_POLICY_ACCEPTED = "extra_privacy_policy_accepted";
static final String EXTRA_TERMS_OF_USE_ACCEPTED = "extra_terms_of_use_accepted";
static final String EXTRA_PROMO_ACCEPTED = "extra_promo_accepted";
static final List<String> FACEBOOK_PERMISSIONS =
Collections.singletonList("email");
}

33
android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java
View file

@ -1,33 +0,0 @@
package com.mapswithme.maps.auth;
import android.content.Intent;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.facebook.AccessToken;
import com.mapswithme.maps.Framework;
class FacebookTokenHandler implements TokenHandler
{
@Override
public boolean checkToken(int requestCode, @NonNull Intent data)
{
AccessToken facebookToken = AccessToken.getCurrentAccessToken();
return facebookToken != null && !TextUtils.isEmpty(facebookToken.getToken());
}
@Nullable
@Override
public String getToken()
{
AccessToken facebookToken = AccessToken.getCurrentAccessToken();
return facebookToken != null ? facebookToken.getToken() : null;
}
@Override
public int getType()
{
return Framework.SOCIAL_TOKEN_FACEBOOK;
}
}

79
android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java
View file

@ -5,10 +5,6 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@ -16,11 +12,10 @@ import android.view.ViewGroup;
import android.view.Window;
import android.widget.CheckBox;
import com.facebook.CallbackManager;
import com.facebook.FacebookCallback;
import com.facebook.FacebookException;
import com.facebook.login.LoginManager;
import com.facebook.login.LoginResult;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.gms.auth.api.signin.GoogleSignIn;
import com.google.android.gms.auth.api.signin.GoogleSignInClient;
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
@ -33,7 +28,6 @@ import com.mapswithme.util.log.Logger;
import com.mapswithme.util.log.LoggerFactory;
import com.mapswithme.util.statistics.Statistics;
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@ -46,10 +40,9 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
@NonNull
private GoogleSignInClient mGoogleSignInClient;
@NonNull
private final CallbackManager mFacebookCallbackManager = CallbackManager.Factory.create();
@NonNull
private final List<TokenHandler> mTokenHandlers = Arrays.asList(
new FacebookTokenHandler(), new GoogleTokenHandler(), new PhoneTokenHandler());
new GoogleTokenHandler(), new PhoneTokenHandler()
);
@Nullable
private TokenHandler mCurrentTokenHandler;
@NonNull
@ -69,14 +62,6 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
trackStatsIfArgsExist(Statistics.EventName.AUTH_START);
}
};
@NonNull
private final View.OnClickListener mFacebookClickListener = v -> {
LoginManager lm = LoginManager.getInstance();
lm.logInWithReadPermissions(SocialAuthDialogFragment.this,
Constants.FACEBOOK_PERMISSIONS);
lm.registerCallback(mFacebookCallbackManager, new FBCallback(SocialAuthDialogFragment.this));
trackStatsIfArgsExist(Statistics.EventName.AUTH_START);
};
@SuppressWarnings("NullableProblems")
@NonNull
private CheckBox mPrivacyPolicyCheck;
@ -140,20 +125,19 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
View view = inflater.inflate(R.layout.fragment_auth_passport_dialog, container, false);
setLoginButton(view, R.id.google_button, mGoogleClickListener);
setLoginButton(view, R.id.facebook_button, mFacebookClickListener);
setLoginButton(view, R.id.phone_button, mPhoneClickListener);
mPromoCheck = view.findViewById(R.id.newsCheck);
mPrivacyPolicyCheck = view.findViewById(R.id.privacyPolicyCheck);
mPrivacyPolicyCheck.setOnCheckedChangeListener((buttonView, isChecked) -> {
setButtonAvailability(view, isChecked && mTermOfUseCheck.isChecked(),
R.id.google_button, R.id.facebook_button, R.id.phone_button);
R.id.google_button, R.id.phone_button);
});
mTermOfUseCheck = view.findViewById(R.id.termOfUseCheck);
mTermOfUseCheck.setOnCheckedChangeListener((buttonView, isChecked) -> {
setButtonAvailability(view, isChecked && mPrivacyPolicyCheck.isChecked(),
R.id.google_button, R.id.facebook_button, R.id.phone_button);
R.id.google_button, R.id.phone_button);
});
UiUtils.linkifyView(view, R.id.privacyPolicyLink, R.string.sign_agree_pp_gdpr,
@ -162,8 +146,7 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
UiUtils.linkifyView(view, R.id.termOfUseLink, R.string.sign_agree_tof_gdpr,
Framework.nativeGetTermsOfUseLink());
setButtonAvailability(view, false, R.id.google_button, R.id.facebook_button,
R.id.phone_button);
setButtonAvailability(view, false, R.id.google_button, R.id.phone_button);
trackStatsIfArgsExist(Statistics.EventName.AUTH_SHOWN);
return view;
@ -214,7 +197,6 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);
mFacebookCallbackManager.onActivityResult(requestCode, resultCode, data);
if (resultCode != Activity.RESULT_OK || data == null)
return;
@ -262,47 +244,4 @@ public class SocialAuthDialogFragment extends BaseMwmDialogFragment
super.onDismiss(dialog);
}
private static class FBCallback implements FacebookCallback<LoginResult>
{
@NonNull
private final WeakReference<SocialAuthDialogFragment> mFragmentRef;
private FBCallback(@NonNull SocialAuthDialogFragment fragment)
{
mFragmentRef = new WeakReference<>(fragment);
}
@Override
public void onSuccess(LoginResult loginResult)
{
Statistics.INSTANCE.trackUGCExternalAuthSucceed(Statistics.ParamValue.FACEBOOK);
LOGGER.d(TAG, "onSuccess");
}
@Override
public void onCancel()
{
LOGGER.w(TAG, "onCancel");
sendEmptyResult(Activity.RESULT_CANCELED, Framework.SOCIAL_TOKEN_FACEBOOK,
null, true);
}
@Override
public void onError(FacebookException error)
{
LOGGER.e(TAG, "onError", error);
sendEmptyResult(Activity.RESULT_CANCELED, Framework.SOCIAL_TOKEN_FACEBOOK,
error != null ? error.getMessage() : null, false);
}
private void sendEmptyResult(int resultCode, @Framework.AuthTokenType int type,
@Nullable String error, boolean isCancel)
{
SocialAuthDialogFragment fragment = mFragmentRef.get();
if (fragment == null)
return;
fragment.sendResult(resultCode, null, type, error, isCancel);
}
}
}

8
android/src/com/mapswithme/maps/editor/OsmOAuth.java
View file

@ -20,7 +20,6 @@ public final class OsmOAuth
public enum AuthType
{
OSM("OSM"),
FACEBOOK("Facebook"),
GOOGLE("Google");
public final String name;
@ -139,13 +138,6 @@ public final class OsmOAuth
@Nullable
public static native String[] nativeAuthWithWebviewToken(String key, String secret, String verifier);
/**
* @return url for web auth, and token with secret for finishing authorization later
*/
@Size(3)
@Nullable
public static native String[] nativeGetFacebookAuthUrl();
/**
* @return url for web auth, and token with secret for finishing authorization later
*/

1
android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java
View file

@ -19,7 +19,6 @@ public class NativeAdWrapper implements MwmNativeAd
{
{
put(NetworkType.MOPUB, UiType.DEFAULT);
put(NetworkType.FACEBOOK, UiType.DEFAULT);
put(NetworkType.MYTARGET, UiType.DEFAULT);
}
};

26
android/src/com/mapswithme/util/sharing/ViralEditorShareable.java
View file

@ -6,16 +6,10 @@ import android.net.Uri;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import java.util.Locale;
import com.facebook.FacebookSdk;
import com.facebook.share.model.ShareLinkContent;
import com.facebook.share.widget.ShareDialog;
import com.mapswithme.util.UiUtils;
public class ViralEditorShareable extends BaseShareable
{
private static final String FACEBOOK_SHARE_URL = "https://omaps.app/fb-editor-v1?lang=" + Locale.getDefault().getLanguage();
private static final String VIRAL_TAIL = " https://omaps.app/im_get";
private final Uri mUri;
@ -45,12 +39,6 @@ public class ViralEditorShareable extends BaseShareable
Intent intent = getTargetIntent(target);
String lowerCaseName = target.activityName.toLowerCase();
if (lowerCaseName.contains("facebook"))
{
shareFacebook();
return;
}
setText(mText + VIRAL_TAIL);
if (lowerCaseName.contains("sms") || lowerCaseName.contains("mms"))
@ -67,18 +55,4 @@ public class ViralEditorShareable extends BaseShareable
super.share(target);
}
private void shareFacebook()
{
FacebookSdk.sdkInitialize(getActivity());
ShareDialog shareDialog = new ShareDialog(getActivity());
if (ShareDialog.canShow(ShareLinkContent.class))
{
ShareLinkContent linkContent = new ShareLinkContent.Builder()
.setContentUrl(Uri.parse(FACEBOOK_SHARE_URL))
.build();
shareDialog.show(linkContent);
}
}
}

19
android/src/com/mapswithme/util/statistics/Statistics.java
View file

@ -12,11 +12,8 @@ import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.billingclient.api.BillingClient;
import com.facebook.ads.AdError;
import com.facebook.appevents.AppEventsLogger;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.PrivateVariables;
import com.mapswithme.maps.ads.MwmNativeAd;
import com.mapswithme.maps.ads.NativeAdError;
@ -35,7 +32,6 @@ import com.mapswithme.maps.purchase.ValidationStatus;
import com.mapswithme.maps.routing.RoutePointInfo;
import com.mapswithme.maps.routing.RoutingOptions;
import com.mapswithme.maps.settings.RoadType;
import com.mapswithme.maps.taxi.TaxiInfoError;
import com.mapswithme.maps.taxi.TaxiManager;
import com.mapswithme.maps.taxi.TaxiType;
import com.mapswithme.maps.widget.menu.MainMenu;
@ -90,10 +86,8 @@ import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE
import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE_PRODUCT_DELIVERED;
import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE_STORE_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.INAPP_PURCHASE_VALIDATION_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_BLANK;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_CLOSE;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_ERROR;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_BANNER_SHOW;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_OWNERSHIP_BUTTON_CLICK;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_SPONSORED_BOOK;
import static com.mapswithme.util.statistics.Statistics.EventName.PP_SPONSORED_ERROR;
@ -166,7 +160,6 @@ import static com.mapswithme.util.statistics.Statistics.ParamValue.BACKUP;
import static com.mapswithme.util.statistics.Statistics.ParamValue.BICYCLE;
import static com.mapswithme.util.statistics.Statistics.ParamValue.BOOKING_COM;
import static com.mapswithme.util.statistics.Statistics.ParamValue.DISK_NO_SPACE;
import static com.mapswithme.util.statistics.Statistics.ParamValue.FACEBOOK;
import static com.mapswithme.util.statistics.Statistics.ParamValue.FALSE;
import static com.mapswithme.util.statistics.Statistics.ParamValue.GOOGLE;
import static com.mapswithme.util.statistics.Statistics.ParamValue.HOLIDAY;
@ -499,7 +492,6 @@ public enum Statistics implements Initializable<Context>
static final String PP_SPONSORED_USER_ITEM = "Placepage_SponsoredGallery_UsersItem_shown";
static final String PP_BANNER_SHOW = "Placepage_Banner_show";
static final String PP_BANNER_ERROR = "Placepage_Banner_error";
static final String PP_BANNER_BLANK = "Placepage_Banner_blank";
static final String PP_BANNER_CLOSE = "Placepage_Banner_close";
static final String PP_OWNERSHIP_BUTTON_CLICK = "Placepage_OwnershipButton_click";
@ -514,8 +506,6 @@ public enum Statistics implements Initializable<Context>
// dialogs
public static final String RATE_DIALOG_LATER = "GPlay dialog cancelled.";
public static final String FACEBOOK_INVITE_LATER = "Facebook invites dialog cancelled.";
public static final String FACEBOOK_INVITE_INVITED = "Facebook invites dialog accepted.";
static final String RATE_DIALOG_RATED = "GPlay dialog. Rating set";
// misc
@ -680,7 +670,6 @@ public enum Statistics implements Initializable<Context>
public static final String IS_SUCCESS = "is_success_message";
public static final String ERR_MSG = "error_message";
public static final String OSM = "OSM";
public static final String FACEBOOK = "Facebook";
public static final String PROVIDER = "provider";
public static final String HOTEL = "hotel";
public static final String ERROR = "error";
@ -793,7 +782,6 @@ public enum Statistics implements Initializable<Context>
public static final String NEXT = "next";
public static final String NO_PRODUCTS = "no_products";
public static final String EDIT = "edit";
public static final String FACEBOOK = "facebook";
public static final String CHECKIN = "check_in";
public static final String CHECKOUT = "check_out";
public static final String ANY = "any";
@ -993,7 +981,6 @@ public enum Statistics implements Initializable<Context>
{
if (mEnabled)
{
AppEventsLogger.activateApp(activity.getApplication());
org.alohalytics.Statistics.onStart(activity);
}
@ -1223,15 +1210,13 @@ public enum Statistics implements Initializable<Context>
public void trackPPBannerError(@NonNull String bannerId, @NonNull String provider,
@Nullable NativeAdError error, int state)
{
boolean isAdBlank = error != null && error.getCode() == AdError.NO_FILL_ERROR_CODE;
String eventName = isAdBlank ? PP_BANNER_BLANK : PP_BANNER_ERROR;
Statistics.ParameterBuilder builder = Statistics.params();
builder.add(BANNER, !TextUtils.isEmpty(bannerId) ? bannerId : "N/A")
.add(ERROR_CODE, error != null ? String.valueOf(error.getCode()) : "N/A")
.add(ERROR_MESSAGE, error != null ? error.getMessage() : "N/A")
.add(PROVIDER, provider)
.add(STATE, String.valueOf(state));
trackEvent(eventName, builder.get());
trackEvent(PP_BANNER_ERROR, builder.get());
}
public void trackBookingSearchEvent(@NonNull MapObject mapObject)
@ -1616,8 +1601,6 @@ public enum Statistics implements Initializable<Context>
{
switch (type)
{
case Framework.SOCIAL_TOKEN_FACEBOOK:
return FACEBOOK;
case Framework.SOCIAL_TOKEN_GOOGLE:
return GOOGLE;
case Framework.SOCIAL_TOKEN_PHONE: