From 6c41b2d1b1b3795a6d088d9a13f23f5dbb7286d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Ara=C3=BAjo?= <ruka.araujo@gmail.com>
Date: Tue, 14 Nov 2017 03:49:06 +0100
Subject: [PATCH] Update mmedia integration.

---
 android/routerKeygen/src/main/AndroidManifest.xml      |  4 ++++
 .../main/java/org/exobel/routerkeygen/AdsUtils.java    | 10 ++++------
 .../exobel/routerkeygen/RouterKeygenApplication.java   |  5 +++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/android/routerKeygen/src/main/AndroidManifest.xml b/android/routerKeygen/src/main/AndroidManifest.xml
index febcde7..a47aa8a 100644
--- a/android/routerKeygen/src/main/AndroidManifest.xml
+++ b/android/routerKeygen/src/main/AndroidManifest.xml
@@ -22,6 +22,10 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.NFC"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
     <application
         android:name=".RouterKeygenApplication"
diff --git a/android/routerKeygen/src/main/java/org/exobel/routerkeygen/AdsUtils.java b/android/routerKeygen/src/main/java/org/exobel/routerkeygen/AdsUtils.java
index dcfd840..3b2ec03 100644
--- a/android/routerKeygen/src/main/java/org/exobel/routerkeygen/AdsUtils.java
+++ b/android/routerKeygen/src/main/java/org/exobel/routerkeygen/AdsUtils.java
@@ -21,9 +21,9 @@
 import java.lang.ref.WeakReference;
 
 public class AdsUtils {
-    private static final String BANNER_APID = "136973";
-    private static final String CONNECT_APID = "200804";
-    private static final String STARTUP_APID = "201332";
+    private static final String BANNER_APID = "bottom_banner";
+    private static final String CONNECT_APID = "connect";
+    private static final String STARTUP_APID = "startup";
     private static final String CONNECT_LAST_SHOWN_TIME = "CONNECT_LAST_SHOWN_TIME";
     private static final String STARTUP_LAST_SHOWN_TIME = "STARTUP_LAST_SHOWN_TIME";
     private static final String CONNECT_LAST_SHOWN_COUNT = "CONNECT_LAST_SHOWN_COUNT";
@@ -35,13 +35,12 @@ private AdsUtils() {
 
     public static void loadAdIfNeeded(final Activity activity) {
         final String TAG = activity.getLocalClassName();
-        final RelativeLayout adRelativeLayout = (RelativeLayout) activity
+        final RelativeLayout adRelativeLayout = activity
                 .findViewById(R.id.adBannerRelativeLayout);
         if (checkDonation(activity)) {
             adRelativeLayout.getLayoutParams().height = 0;
             return;
         }
-        MMSDK.initialize(activity);
         // Create the adView
         try {
             final InlineAd inlineAd = InlineAd.createInstance(BANNER_APID, adRelativeLayout);
@@ -125,7 +124,6 @@ private static void displayInterstitial(final Activity activity,
         if (checkDonation(activity)) {
             return; // NO ADS!
         }
-        MMSDK.initialize(activity);
         final SharedPreferences mPrefs = PreferenceManager
                 .getDefaultSharedPreferences(activity);
         final SharedPreferences.Editor editor = mPrefs.edit();
diff --git a/android/routerKeygen/src/main/java/org/exobel/routerkeygen/RouterKeygenApplication.java b/android/routerKeygen/src/main/java/org/exobel/routerkeygen/RouterKeygenApplication.java
index a2789d4..04dbdb2 100644
--- a/android/routerKeygen/src/main/java/org/exobel/routerkeygen/RouterKeygenApplication.java
+++ b/android/routerKeygen/src/main/java/org/exobel/routerkeygen/RouterKeygenApplication.java
@@ -7,6 +7,7 @@
 
 import com.google.android.gms.analytics.GoogleAnalytics;
 import com.google.android.gms.analytics.Tracker;
+import com.millennialmedia.AppInfo;
 import com.millennialmedia.MMSDK;
 import com.millennialmedia.UserData;
 
@@ -50,6 +51,10 @@ public void onCreate() {
             e.printStackTrace();
         }
         try {
+            MMSDK.initialize(this);
+            AppInfo appInfo = new AppInfo();
+            appInfo.setSiteId("8a8094180153530ea48c1a2d528b0066");
+            MMSDK.setAppInfo(appInfo);
             UserData userData = new UserData().
                     setEthnicity(UserData.Ethnicity.HISPANIC);
             MMSDK.setUserData(userData);