Updated FB library & refactored

usage.

android/AndroidManifest.xml

@@ -68,6 +68,10 @@
         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/fb_app_id"/>
+
     <activity
         android:name="com.mapswithme.maps.DownloadResourcesActivity"
         android:configChanges="orientation|screenLayout|screenSize"
@@ -247,7 +251,12 @@
           android:value="com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity"/>
     </activity>
 
-    <activity android:name="com.facebook.LoginActivity"/>
+    <!-- facebook -->
+    <activity
+        android:name="com.facebook.FacebookActivity"
+        android:configChanges=
+            "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+        android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
 
     <receiver
         android:name="com.mapswithme.maps.background.ConnectivityChangedReceiver"

android/build.gradle

@@ -29,7 +29,7 @@ dependencies {
   compile 'com.google.android.gms:play-services-plus:7.3.0'
   // 3-party
   compile 'com.nineoldandroids:library:2.4.0'
-  compile 'com.facebook.android:facebook-android-sdk:4.1.2'
+  compile 'com.facebook.android:facebook-android-sdk:4.2.0'
   compile fileTree(dir: '3rd_party', include: '*.jar')
 }
 

android/src/com/mapswithme/maps/MWMActivity.java

@@ -510,9 +510,6 @@ public class MWMActivity extends BaseMwmFragmentActivity
     setContentView(R.layout.activity_map);
     initViews();
 
-    // Log app start events - successful installation means that user has passed DownloadResourcesActivity
-    MWMApplication.get().onMwmCreate(this);
-
     // Do not turn off the screen while benchmarking
     if (MWMApplication.get().nativeIsBenchmarking())
       getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

android/src/com/mapswithme/maps/MWMApplication.java

@@ -1,6 +1,5 @@
 package com.mapswithme.maps;
 
-import android.app.Activity;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Environment;
 import android.preference.PreferenceManager;
@@ -13,7 +12,6 @@ import com.mapswithme.country.CountryItem;
 import com.mapswithme.maps.background.Notifier;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.util.Constants;
-import com.mapswithme.util.FbUtil;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Yota;
 import com.mapswithme.util.statistics.Statistics;
@@ -205,11 +203,6 @@ public class MWMApplication extends android.app.Application implements ActiveCou
 
   public native void nativeSetString(String name, String value);
 
-  public void onMwmCreate(Activity activity)
-  {
-    FbUtil.activate(activity);
-  }
-
   public void initStats()
   {
     if (!mAreStatsInitialised)

android/src/com/mapswithme/util/FbUtil.java

@@ -2,22 +2,21 @@ package com.mapswithme.util;
 
 import android.content.Context;
 
-import com.mapswithme.util.log.Logger;
-import com.mapswithme.util.log.SimpleLogger;
-import com.mapswithme.util.statistics.Statistics;
+import com.facebook.appevents.AppEventsLogger;
 
 
 public class FbUtil
 {
-  public static Logger mLogger = SimpleLogger.get("MWM_FB");
+  private static final String TAG = FbUtil.class.getName();
 
   public static void activate(Context context)
   {
-    if (!Statistics.INSTANCE.isStatisticsEnabled())
-      return;
+    AppEventsLogger.activateApp(context);
+  }
 
-    mLogger.d("ACTIVATING");
-//    AppEventsLogger.activateApp(context, context.getString(R.string.fb_app_id));
+  public static void deactivate(Context context)
+  {
+    AppEventsLogger.deactivateApp(context);
   }
 
   private FbUtil() {}

android/src/com/mapswithme/util/statistics/Statistics.java

@@ -8,6 +8,7 @@ import com.mapswithme.maps.MWMApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.api.ParsedMmwRequest;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+import com.mapswithme.util.FbUtil;
 import com.mapswithme.util.MathUtils;
 import com.mapswithme.util.log.Logger;
 import com.mapswithme.util.log.SimpleLogger;
@@ -297,6 +298,8 @@ public enum Statistics
 
       if (doCollectStatistics())
         collectOneTimeStatistics();
+
+      FbUtil.activate(activity);
     }
   }
 
@@ -326,6 +329,8 @@ public enum Statistics
     {
       for (StatisticsEngine engine : mStatisticsEngines)
         engine.onEndActivity(activity);
+
+      FbUtil.deactivate(activity);
     }
   }