From 60da45c4929ab560ac3ff7e248df7c9a454db58c Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Sat, 17 Feb 2018 20:59:18 +0100
Subject: [PATCH] Updates for push

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/build.gradle                                 |  4 +---
 app/src/main/AndroidManifest.xml                 |  4 ++++
 .../application/NextcloudTalkApplication.java    | 16 +++-------------
 app/src/main/res/values/setup.xml                | 11 +++++++++++
 build.gradle                                     |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b1b245d6d..451795120 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,7 +125,6 @@ dependencies {
 
     implementation 'com.evernote:android-job:1.2.4'
 
-    implementation "com.google.android.gms:play-services-gcm:${googleLibraryVersion}"
     implementation "com.google.firebase:firebase-messaging:${googleLibraryVersion}"
 
     implementation 'com.yarolegovich:lovely-dialog:1.1.0'
@@ -143,5 +142,4 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 }
-
-apply plugin: 'com.google.gms.google-services'
+//apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f1a9c9dd4..180f28462 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -76,5 +76,9 @@
             </intent-filter>
         </service>
 
+        <service
+            android:name="com.evernote.android.job.gcm.PlatformGcmService"
+            tools:node="remove"/>
+
     </application>
 </manifest>
diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
index 031836eed..2fc11f121 100644
--- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
+++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
@@ -21,7 +21,6 @@
 package com.nextcloud.talk.application;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.Build;
 import android.support.multidex.MultiDex;
 import android.support.multidex.MultiDexApplication;
@@ -29,7 +28,6 @@ import android.util.Log;
 
 import com.evernote.android.job.JobManager;
 import com.evernote.android.job.JobRequest;
-import com.google.android.gms.security.ProviderInstaller;
 import com.nextcloud.talk.BuildConfig;
 import com.nextcloud.talk.dagger.modules.BusModule;
 import com.nextcloud.talk.dagger.modules.ContextModule;
@@ -57,6 +55,8 @@ import javax.inject.Singleton;
 import autodagger.AutoComponent;
 import autodagger.AutoInjector;
 
+//import com.google.android.gms.security.ProviderInstaller;
+
 @AutoComponent(
         modules = {
                 BusModule.class,
@@ -69,7 +69,7 @@ import autodagger.AutoInjector;
 
 @Singleton
 @AutoInjector(NextcloudTalkApplication.class)
-public class NextcloudTalkApplication extends MultiDexApplication implements ProviderInstaller.ProviderInstallListener {
+public class NextcloudTalkApplication extends MultiDexApplication {
     private static final String TAG = NextcloudTalkApplication.class.getSimpleName();
 
     //region Public variables
@@ -112,7 +112,6 @@ public class NextcloudTalkApplication extends MultiDexApplication implements Pro
     @Override
     public void onCreate() {
         super.onCreate();
-        ProviderInstaller.installIfNeededAsync(this, this);
 
         JobManager.create(this).addJobCreator(new MagicJobCreator());
 
@@ -157,15 +156,6 @@ public class NextcloudTalkApplication extends MultiDexApplication implements Pro
         sharedApplication = null;
     }
 
-    @Override
-    public void onProviderInstalled() {
-
-    }
-
-    @Override
-    public void onProviderInstallFailed(int i, Intent intent) {
-
-    }
     //endregion
 
     //region Getters
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index ba122b5ef..7d5742111 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -18,4 +18,15 @@
     <!-- Package name from which to import accounts - if empty, won't ever be shown -->
     <string name="nc_import_accounts_from" translatable="false">com.nextcloud.client</string>
     <string name="nc_import_account_type" translatable="false">nextcloud</string>
+
+    <!-- Push notifications -->
+    <string name="default_web_client_id" translatable="false">829118773643-cq33cmhv7mnv7iq8mjv6rt7t15afc70k.apps.googleusercontent.com</string>
+    <string name="firebase_database_url" translatable="false">https://nextcloud-a7dea.firebaseio.com</string>
+    <string name="gcm_defaultSenderId" translatable="false">829118773643</string>
+    <string name="google_api_key" translatable="false">AIzaSyAWIyOcLafaFp8PFL61h64cy1NNZW2cU_s</string>
+    <string name="google_app_id" translatable="false">1:829118773643:android:54b65087c544d819</string>
+    <string name="google_crash_reporting_api_key" translatable="false">AIzaSyAWIyOcLafaFp8PFL61h64cy1NNZW2cU_s</string>
+    <string name="google_storage_bucket" translatable="false">nextcloud-a7dea.appspot.com</string>
+    <string name="project_id" translatable="false">nextcloud-a7dea</string>
+
 </resources>
diff --git a/build.gradle b/build.gradle
index a3ad993ef..250cf25b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
-        classpath 'com.google.gms:google-services:3.1.0'
+        //classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files