From 0dc98268c569a7198e4bdb6a1c472fc6f86a72b4 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 4 May 2018 13:38:08 +0200
Subject: [PATCH] Removed all references to old GCM API

---
 AndroidManifest.xml                           |  22 ----
 build.gradle                                  |   4 +-
 src/android/org/linphone/gcm/GCMReceiver.java |  31 ------
 src/android/org/linphone/gcm/GCMService.java  | 105 ------------------
 4 files changed, 2 insertions(+), 160 deletions(-)
 delete mode 100644 src/android/org/linphone/gcm/GCMReceiver.java
 delete mode 100644 src/android/org/linphone/gcm/GCMService.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2a9256211..eb5f9c082 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -9,10 +9,6 @@
         android:minSdkVersion="16"
         android:targetSdkVersion="26"/>
 
-    <!-- Permissions for Push Notification -->
-    <!-- <uses-permission android:name="org.linphone.permission.C2D_MESSAGE"/> GCM permission -->
-    <!-- Change package ! -->
-    <!-- <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/> GCM permission -->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -266,24 +262,6 @@
                 <action android:name="android.intent.action.NEW_OUTGOING_CALL" />
             </intent-filter>
         </receiver>
-        <!-- Needed for push notification -->
-        <!--
-            <receiver
-            android:name=".gcm.GCMReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-                <action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
-
-                <category android:name="org.linphone"/>
-        -->
-        <!-- Change package ! -->
-        <!--
-        </intent-filter>
-        </receiver>
-
-        <service android:name=".gcm.GCMService"/>
-        -->
 
         <receiver
             android:name=".receivers.AccountEnableReceiver"
diff --git a/build.gradle b/build.gradle
index 47753c428..393558930 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,9 +20,9 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.0'
-        if (googleFile.exists()) {
+	if (googleFile.exists()) {
             classpath 'com.google.gms:google-services:3.1.0'
-        }
+	}
     }
 }
 
diff --git a/src/android/org/linphone/gcm/GCMReceiver.java b/src/android/org/linphone/gcm/GCMReceiver.java
deleted file mode 100644
index 75b38602b..000000000
--- a/src/android/org/linphone/gcm/GCMReceiver.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.linphone.gcm;
-/*
-GCMReceiver.java
-Copyright (C) 2017  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-import android.content.Context;
-
-import com.google.android.gcm.GCMBroadcastReceiver;
-
-
-public class GCMReceiver extends GCMBroadcastReceiver {
-    @Override
-    protected String getGCMIntentServiceClassName(Context context) {
-        return "org.linphone.gcm.GCMService";
-    }
-}
\ No newline at end of file
diff --git a/src/android/org/linphone/gcm/GCMService.java b/src/android/org/linphone/gcm/GCMService.java
deleted file mode 100644
index f956cd418..000000000
--- a/src/android/org/linphone/gcm/GCMService.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.linphone.gcm;
-/*
-GCMService.java
-Copyright (C) 2017  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-import static android.content.Intent.ACTION_MAIN;
-
-import org.linphone.LinphoneManager;
-import org.linphone.LinphonePreferences;
-import org.linphone.LinphoneService;
-import org.linphone.LinphoneUtils;
-import org.linphone.R;
-import org.linphone.core.Factory;
-import org.linphone.core.LogCollectionState;
-import org.linphone.mediastream.Log;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.google.android.gcm.GCMBaseIntentService;
-
-// Warning ! Do not rename the service !
-public class GCMService extends GCMBaseIntentService {
-
-	public GCMService() {
-
-	}
-
-	private void initLogger(Context context) {
-		LinphonePreferences.instance().setContext(context);
-		boolean isDebugEnabled = LinphonePreferences.instance().isDebugEnabled();
-		Factory.instance().enableLogCollection(isDebugEnabled ? LogCollectionState.Enabled : LogCollectionState.Disabled);
-		Factory.instance().setDebugMode(isDebugEnabled, context.getString(R.string.app_name));
-	}
-
-	@Override
-	protected void onError(Context context, String errorId) {
-		initLogger(context);
-		Log.e("[Push Notification] Error while registering: " + errorId);
-	}
-
-	@Override
-	protected void onMessage(Context context, Intent intent) {
-		initLogger(context);
-		Log.d("[Push Notification] Received");
-
-		if (!LinphoneService.isReady()) {
-			context.startService(new Intent(ACTION_MAIN).setClass(context, LinphoneService.class));
-		} else if (LinphoneManager.isInstanciated() && LinphoneManager.getLc().getCallsNb() == 0) {
-			LinphoneUtils.dispatchOnUIThread(new Runnable(){
-				@Override
-				public void run() {
-					if (LinphoneManager.isInstanciated() && LinphoneManager.getLc().getCallsNb() == 0){
-						LinphoneManager.getLc().setNetworkReachable(false);
-						LinphoneManager.getLc().setNetworkReachable(true);
-					}
-				}
-			});
-		}
-	}
-
-	@Override
-	protected void onRegistered(Context context, final String regId) {
-		initLogger(context);
-		Log.d("[Push Notification] Registered: " + regId);
-		LinphoneUtils.dispatchOnUIThread(new Runnable(){
-			@Override
-			public void run() {
-				LinphonePreferences.instance().setPushNotificationRegistrationID(regId);
-			}
-		});
-	}
-
-	@Override
-	protected void onUnregistered(Context context, String regId) {
-		initLogger(context);
-		Log.w("[Push Notification] Unregistered: " + regId);
-
-		LinphoneUtils.dispatchOnUIThread(new Runnable(){
-			@Override
-			public void run() {
-				LinphonePreferences.instance().setPushNotificationRegistrationID(null);
-			}
-		});
-	}
-
-	protected String[] getSenderIds(Context context) {
-	    return new String[] { context.getString(R.string.push_sender_id) };
-	}
-}