From f88b9016faf3e1d0d0b43a73adf35d3f0ecbe777 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 16 Apr 2018 16:59:44 +0200
Subject: [PATCH] Mattermost: Update to 3.10.2 Remove Play services

---
 metadata/com.mattermost.mattermost.txt        | 31 ++++----
 .../play-services.patch                       | 77 +++++++++++++++++++
 2 files changed, 93 insertions(+), 15 deletions(-)
 create mode 100644 metadata/com.mattermost.mattermost/play-services.patch

diff --git a/metadata/com.mattermost.mattermost.txt b/metadata/com.mattermost.mattermost.txt
index 32cb4fad8b..1b823e5572 100644
--- a/metadata/com.mattermost.mattermost.txt
+++ b/metadata/com.mattermost.mattermost.txt
@@ -1,12 +1,11 @@
-Disabled:play-services usage
 Categories:Internet
-License:Unknown
-Web Site:
-Source Code:https://github.com/mattermost/android
-Issue Tracker:https://github.com/mattermost/android/issues
+License:Apache-2.0
+Web Site:https://about.mattermost.com/
+Source Code:https://github.com/mattermost/mattermost-android-classic
+Issue Tracker:https://github.com/mattermost/mattermost-android-classic/issues
 
-Auto Name:Mattermost
-Summary:secure, workplace messaging
+Auto Name:Mattermost Classic
+Summary:Secure, workplace messaging
 Description:
 Mattermost is secure, workplace messaging from behind your firewall.
 
@@ -22,18 +21,20 @@ own server go to http://www.mattermost.org/download/
 Find the Terms of Service for this app here: https://about.mattermost.com/terms
 
 This is a reference implementation of an open source Mattermost Android app
-available at: https://github.com/mattermost/android
+available at: https://github.com/mattermost/mattermost-android-classic
 .
 
 Repo Type:git
-Repo:https://github.com/mattermost/android
+Repo:https://github.com/mattermost/mattermost-android-classic.git
 
-Build:3.4.1,341
-    commit=v3.4.1
+Build:3.10.2,398
+    commit=v3.10.2
     subdir=app
+    patch=play-services.patch
     gradle=yes
+    prebuild=rm -r src/main/java/com/mattermost/gcm/
 
-Auto Update Mode:None
-Update Check Mode:None
-Current Version:3.4.1
-Current Version Code:341
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:3.10.2
+Current Version Code:398
diff --git a/metadata/com.mattermost.mattermost/play-services.patch b/metadata/com.mattermost.mattermost/play-services.patch
new file mode 100644
index 0000000000..095ab0da14
--- /dev/null
+++ b/metadata/com.mattermost.mattermost/play-services.patch
@@ -0,0 +1,77 @@
+diff --git a/app/build.gradle b/app/build.gradle
+index d8311b0..08d4ec5 100755
+--- a/app/build.gradle
++++ b/app/build.gradle
+@@ -34,7 +34,6 @@ dependencies {
+     compile 'com.android.support:appcompat-v7:26.0.2'
+     compile 'com.squareup.okhttp:okhttp:2.5.0'
+     compile 'com.squareup.okhttp:okhttp-urlconnection:2.5.0'
+-    compile 'com.google.android.gms:play-services-gcm:11.8.0'
+
+     /* If you want to enable unread message badges */
+     // compile 'me.leolin:ShortcutBadger:1.1.3@aar'
+@@ -46,5 +45,3 @@ dependencies {
+             [group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.4.1']
+     )
+ }
+-
+-apply plugin: 'com.google.gms.google-services'
+diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
+index c3131c3..0724942 100755
+--- a/app/src/main/AndroidManifest.xml
++++ b/app/src/main/AndroidManifest.xml
+@@ -42,9 +42,6 @@
+         android:supportsRtl="true"
+         android:hardwareAccelerated="true">
+
+-        <meta-data
+-            android:name="com.google.android.gms.version"
+-            android:value="@integer/google_play_services_version" />
+
+
+         <activity
+diff --git a/app/src/main/java/com/mattermost/mattermost/MainActivity.java b/app/src/main/java/com/mattermost/mattermost/MainActivity.java
+index f355dc8..40f9c9a 100755
+--- a/app/src/main/java/com/mattermost/mattermost/MainActivity.java
++++ b/app/src/main/java/com/mattermost/mattermost/MainActivity.java
+@@ -18,7 +18,6 @@ import android.app.AlertDialog;
+ import android.content.DialogInterface;
+ import android.view.KeyEvent;
+
+-import com.google.android.gms.gcm.GoogleCloudMessaging;
+ import com.mattermost.model.User;
+ import com.mattermost.service.IResultListener;
+ import com.mattermost.service.MattermostService;
+@@ -36,7 +35,6 @@ public class MainActivity extends WebViewActivity {
+     Uri appUri;
+
+     String senderID;
+-    GoogleCloudMessaging gcm;
+     ProgressDialog dialog;
+     long timeAway;
+
+diff --git a/app/src/main/java/com/mattermost/mattermost/SplashScreenActivity.java b/app/src/main/java/com/mattermost/mattermost/SplashScreenActivity.java
+index 476d650..4641dfa 100755
+--- a/app/src/main/java/com/mattermost/mattermost/SplashScreenActivity.java
++++ b/app/src/main/java/com/mattermost/mattermost/SplashScreenActivity.java
+@@ -8,7 +8,6 @@ import android.content.Intent;
+ import android.os.Bundle;
+ import android.util.Log;
+
+-import com.mattermost.gcm.RegistrationIntentService;
+
+ import java.io.File;
+
+@@ -29,11 +28,9 @@ public class SplashScreenActivity extends AppActivity {
+     private void onAfterCreate() {
+         enableHttpResponseCache();
+
+-        Intent intent = new Intent(this, RegistrationIntentService.class);
+-        startService(intent);
+
+         boolean teamSet = service.getBaseUrl() != null;
+-        intent = new Intent(this, teamSet ? MainActivity.class : SelectServerActivity.class);
++        Intent intent = new Intent(this, teamSet ? MainActivity.class : SelectServerActivity.class);
+         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+         startActivity(intent);
+         finish();