removed firebase. moved to optional library.

RestComm · Sep 21, 2016 · 67893c9 · 67893c9
1 parent 2056f06
commit 67893c9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/examples/Restcomm_demo/app/build.gradle b/examples/Restcomm_demo/app/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.2.0'
 
     // TODO:  To set up the project to use actual Restcomm SDK, please edit settings.gradle to set actual path to sdk
-    compile project(':restcomm.android.sdk')
+    //compile project(':restcomm.android.sdk')
     // TODO: Otherwise for now, I shipped .aar file with the modified SDK
     //compile(name:'restcomm.android.client.sdk-debug', ext:'aar')
 

diff --git a/examples/Restcomm_demo/app/src/main/java/com/telestax/restcomm_helloworld/MainActivity.java b/examples/Restcomm_demo/app/src/main/java/com/telestax/restcomm_helloworld/MainActivity.java
@@ -29,7 +29,7 @@
 import com.cortxt.app.corelib.Utils.QosAPI;
 import com.cortxt.app.corelib.Utils.QosInfo;
 import com.cortxt.app.utillib.DataObjects.EventType;
-import com.cortxt.app.utillib.Utils.FirebaseInvite;
+//import com.cortxt.app.utillib.Utils.FirebaseInvite;
 import com.cortxt.app.utillib.Utils.LoggerUtil;
 
 import java.util.HashMap;

diff --git a/mmcextension/src/main/java/com/cortxt/com/mmcextension/MMCSystemUtil.java b/mmcextension/src/main/java/com/cortxt/com/mmcextension/MMCSystemUtil.java
@@ -69,5 +69,8 @@ public static boolean isServiceModeEnabled ()
     public static void startRilReader (Context context, boolean bStart, boolean useLogcat)
     {
     }
+    public static void checkFirebaseRegistration (Context context)
+    {
+    }
 
 }
diff --git a/qoslib/build.gradle b/qoslib/build.gradle
@@ -70,6 +70,7 @@ repositories {
 }
 dependencies {
     //compile project(':mmcextension')
+    compile 'com.android.support:appcompat-v7:22.2.0'
     debugCompile project(path: ':mmcextension', configuration: "libraryDebug")
     releaseCompile project(path: ':mmcextension', configuration: "libraryRelease")
 }
diff --git a/qoslib/src/main/AndroidManifest.xml b/qoslib/src/main/AndroidManifest.xml
@@ -34,8 +34,8 @@
         android:name="com.google.android.maps.v2.API_KEY"
         android:value="@string/google_maps_api_key"/>
 
-    <meta-data android:name="com.google.android.gms.version"
-        android:value="@integer/google_play_services_version" />
+    <!--meta-data android:name="com.google.android.gms.version"
+        android:value="@integer/google_play_services_version" /-->
 
     <application>
         <uses-library android:name="com.google.android.maps" />

diff --git a/qoslib/src/main/java/com/cortxt/app/corelib/MainService.java b/qoslib/src/main/java/com/cortxt/app/corelib/MainService.java
@@ -49,7 +49,7 @@
 import com.cortxt.app.corelib.Services.LibPhoneStateListener;
 import com.cortxt.app.utillib.Utils.Global;
 import com.cortxt.app.utillib.Utils.GpsListener;
-import com.cortxt.com.mmcextension.firebase.MyFirebaseInstanceIDService;
+//import com.cortxt.com.mmcextension.firebase.MyFirebaseInstanceIDService;
 import com.cortxt.com.mmcextension.VQ.VQManager;
 import com.cortxt.app.corelib.Services.TrackingManager;
 import com.cortxt.app.corelib.Services.Events.EventManager;
@@ -224,7 +224,8 @@ public void onCreate() {
 			verifyRegistration();
 
 			if (getApiKey(this) != null)
-				MyFirebaseInstanceIDService.checkFCMRegistration (MainService.this);
+				MMCSystemUtil.checkFirebaseRegistration (this);
+
 			//		mReportManager.checkPlayServices(this, true);
         }
 		catch (Exception e) {
@@ -1115,7 +1116,8 @@ public void run() {
 							mApikey = null;
 							mReportManager.authorizeDevice(getLogin(MainService.this), QosAPI.getPassword(MainService.this), false);
 							// Ensure registered for Firebase Cloud Messages
-							MyFirebaseInstanceIDService.checkFCMRegistration (MainService.this);
+							MMCSystemUtil.checkFirebaseRegistration (MainService.this);
+
 						//	mReportManager.checkPlayServices(MainService.this, true);
 						}
 					} catch (Exception e) {