From e69d7adbe9e76b3e9241b4b8c46bd93b71eb37cd Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Sat, 24 Oct 2020 22:37:08 +0200
Subject: [PATCH] Allow builds with firebase to work without play services
 again

---
 nymea-app/nymea-app.pro                        |  2 ++
 .../nymeaapp/NymeaAppNotificationService.java  | 14 ++++++++++++++
 .../java/io/guh/nymeaapp/NymeaAppActivity.java | 11 +++++++++++
 nymea-app/pushnotifications.cpp                | 18 ++++++++++++------
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index 0f783401..01062c4a 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -165,3 +165,5 @@ BR=$$BRANDING
 target.path = /usr/bin
 INSTALLS += target
 
+ANDROID_ABIS = armeabi-v7a arm64-v8a
+
diff --git a/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java b/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java
index 3730824a..66887058 100644
--- a/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java
+++ b/nymea-app/platformintegration/android/java-firebase/io/guh/nymeaapp/NymeaAppNotificationService.java
@@ -2,6 +2,8 @@ package io.guh.nymeaapp;
 
 import com.google.firebase.messaging.RemoteMessage;
 import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.android.gms.common.GooglePlayServicesUtil;
+import com.google.android.gms.common.ConnectionResult;
 
 import android.util.Log;
 import android.content.Intent;
@@ -25,6 +27,18 @@ public class NymeaAppNotificationService extends FirebaseMessagingService {
 
     private static final String TAG = "nymea-app: NymeaAppNotificationService";
 
+    public static boolean checkPlayServices() {
+        Log.d(TAG, "Checking for Google Play services");
+        try {
+            Context context = NymeaAppActivity.getAppContext();
+            int resultCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(context);
+            return resultCode == ConnectionResult.SUCCESS;
+        } catch (Exception e) {
+            Log.d(TAG, e.toString());
+        }
+        return true;
+    }
+
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         Intent intent = new Intent(this, NymeaAppActivity.class);
diff --git a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java
index e843c7b6..f63a0463 100644
--- a/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java
+++ b/nymea-app/platformintegration/android/java/io/guh/nymeaapp/NymeaAppActivity.java
@@ -11,6 +11,17 @@ import android.os.Vibrator;
 public class NymeaAppActivity extends org.qtproject.qt5.android.bindings.QtActivity
 {
     private static final String TAG = "nymea-app: NymeaAppActivity";
+    private static Context context = null;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.context = getApplicationContext();
+    }
+
+    public static Context getAppContext() {
+        return NymeaAppActivity.context;
+    }
 
     public String deviceSerial()
     {
diff --git a/nymea-app/pushnotifications.cpp b/nymea-app/pushnotifications.cpp
index 302fa2de..6fddca54 100644
--- a/nymea-app/pushnotifications.cpp
+++ b/nymea-app/pushnotifications.cpp
@@ -42,12 +42,18 @@ static PushNotifications *m_client_pointer;
 PushNotifications::PushNotifications(QObject *parent) : QObject(parent)
 {
 #if defined Q_OS_ANDROID && defined WITH_FIREBASE
-    qDebug() << "Setting up firebase";
-    m_client_pointer = this;
-    m_firebaseApp = ::firebase::App::Create(::firebase::AppOptions(), QAndroidJniEnvironment(), QtAndroid::androidActivity().object());
-    m_firebase_initializer.Initialize(m_firebaseApp, nullptr, [](::firebase::App * fapp, void *) {
-        return ::firebase::messaging::Initialize( *fapp, (::firebase::messaging::Listener *)m_client_pointer);
-    });
+    qDebug() << "Checking for play services";
+    jboolean playServicesAvailable = QAndroidJniObject::callStaticMethod<jboolean>("io.guh.nymeaapp.NymeaAppNotificationService", "checkPlayServices", "()Z");
+    if (playServicesAvailable) {
+        qDebug() << "Setting up firebase";
+        m_client_pointer = this;
+        m_firebaseApp = ::firebase::App::Create(::firebase::AppOptions(), QAndroidJniEnvironment(), QtAndroid::androidActivity().object());
+        m_firebase_initializer.Initialize(m_firebaseApp, nullptr, [](::firebase::App * fapp, void *) {
+            return ::firebase::messaging::Initialize( *fapp, (::firebase::messaging::Listener *)m_client_pointer);
+        });
+    } else {
+        qDebug() << "Google Play Services not available. Cannot connect to push client.";
+    }
 #endif