Merge pull request #60 from mattermost/MM-10538

Fixing droid push notifications
mattermost · May 16, 2018 · 8bebca3 · 8bebca3
2 parents cfdc01e + 7e51e8f
commit 8bebca3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ proguard/
 .navigation/
 captures/
 signing-key.jks
-google-services.json
+google-services.json
+app/release/
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "com.mattermost.mattermost"
@@ -12,8 +12,8 @@ android {
          * convert application icon to meet desired lollipop guidelines, that is icon should be
          * flat and white*/
         targetSdkVersion 20
-        versionCode 398
-        versionName "3.10.2"
+        versionCode 399
+        versionName "3.10.3"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/mattermost/service/MattermostService.java b/app/src/main/java/com/mattermost/service/MattermostService.java
@@ -31,6 +31,7 @@
 import retrofit.http.Body;
 import retrofit.http.POST;
 import retrofit.http.GET;
+import retrofit.http.PUT;
 
 
 
@@ -111,7 +112,7 @@ public Promise<User> attachDevice() {
         user.deviceId = "android:" + deviceId.toString();
 
         if (this.isV4()) {
-            return apiClient.attachDeviceV3(user);
+            return apiClient.attachDeviceV4(user);
         } else{
             return apiClient.attachDeviceV3(user);
         }
@@ -171,7 +172,7 @@ public interface MattermostAPI {
         Promise<User> attachDeviceV3(@Body User user);
 
         @Headers("X-Requested-With: XMLHttpRequest")
-        @POST("/api/v4/users/attach_device")
+        @PUT("/api/v4/users/sessions/device")
         Promise<User> attachDeviceV4(@Body User user);
 
         @Headers("X-Requested-With: XMLHttpRequest")

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.google.gms:google-services:3.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 15 14:07:55 PST 2018
+#Fri May 11 07:08:44 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip