Merge branch 'release/1.6.1'

benoitletondor · Jul 12, 2018 · 88b1aee · 88b1aee
2 parents addf4c9 + 254249f
commit 88b1aee
Show file tree

Hide file tree

Showing 42 changed files with 632 additions and 2,118 deletions.
diff --git a/Android/EasyBudget/.gitignore b/Android/EasyBudget/.gitignore
@@ -4,3 +4,4 @@
 /.idea/libraries
 .DS_Store
 /build
+google-services.json
diff --git a/Android/EasyBudget/.idea/.name b/Android/EasyBudget/.idea/.name
diff --git a/Android/EasyBudget/.idea/compiler.xml b/Android/EasyBudget/.idea/compiler.xml
diff --git a/Android/EasyBudget/.idea/copyright/profiles_settings.xml b/Android/EasyBudget/.idea/copyright/profiles_settings.xml
diff --git a/Android/EasyBudget/.idea/gradle.xml b/Android/EasyBudget/.idea/gradle.xml
diff --git a/Android/EasyBudget/EasyBudget.iml b/Android/EasyBudget/EasyBudget.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="EasyBudget" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="EasyBudget" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

diff --git a/Android/EasyBudget/app/app.iml b/Android/EasyBudget/app/app.iml
diff --git a/Android/EasyBudget/app/batch.gradle.sample b/Android/EasyBudget/app/batch.gradle.sample
@@ -1,5 +1,4 @@
 ext { 
     batch_devkey = '"BATCH_DEV_API_KEY"'
     batch_livekey = '"BATCH_LIVE_API_KEY"'
-    gcm_sender_id = '"YOUR_GCM_SENDER_ID"'
 }
diff --git a/Android/EasyBudget/app/build.gradle b/Android/EasyBudget/app/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.21.6'
+        classpath 'io.fabric.tools:gradle:1.25.4'
     }
 }
 
@@ -36,15 +36,14 @@ repositories {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
 
     defaultConfig {
         applicationId "com.benoitletondor.easybudgetapp"
         minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 45
-        versionName "1.5.2"
+        targetSdkVersion 27
+        versionCode 47
+        versionName "1.6.1"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -55,7 +54,6 @@ android {
             buildConfigField "boolean", "ANALYTICS_ACTIVATED", "false"
             buildConfigField "boolean", "DEV_PREFERENCES", "true"
             buildConfigField "String", "LICENCE_KEY", licence_key
-            buildConfigField "String", "GCM_SENDER_ID", gcm_sender_id
         }
         release {
             buildConfigField "boolean", "DEBUG_LOG", "false"
@@ -64,7 +62,6 @@ android {
             buildConfigField "boolean", "ANALYTICS_ACTIVATED", "true"
             buildConfigField "boolean", "DEV_PREFERENCES", "false"
             buildConfigField "String", "LICENCE_KEY", licence_key
-            buildConfigField "String", "GCM_SENDER_ID", gcm_sender_id
 
             minifyEnabled true
             shrinkResources true
@@ -74,18 +71,21 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:percent:25.3.1'
-    compile 'com.google.android.gms:play-services-gcm:10.2.4'
-    compile 'com.google.android.gms:play-services-analytics:10.2.4'
-    compile 'com.google.android.gms:play-services-appinvite:10.2.4'
-    compile 'com.roomorama:caldroid:3.0.1'
-    compile 'com.getbase:floatingactionbutton:1.10.1'
-    compile 'me.relex:circleindicator:1.2.2@aar'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { transitive = true; }
-    compile 'com.batch.android:batch-sdk:1.8.0'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:percent:27.1.1'
+    implementation 'com.google.android.gms:play-services-analytics:16.0.1'
+    implementation 'com.google.android.gms:play-services-appinvite:16.0.1'
+    implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-messaging:17.1.0'
+    implementation 'com.android.billingclient:billing:1.1'
+    implementation 'com.roomorama:caldroid:3.0.1'
+    implementation 'com.getbase:floatingactionbutton:1.10.1'
+    implementation 'me.relex:circleindicator:1.2.2@aar'
+    implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') { transitive = true }
+    implementation 'com.batch.android:batch-sdk:1.12.1'
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/Android/EasyBudget/app/proguard-rules.pro b/Android/EasyBudget/app/proguard-rules.pro
@@ -26,4 +26,6 @@
 }
 
 -dontwarn com.batch.android.mediation.**
--dontwarn com.batch.android.BatchPushService
+-dontwarn com.batch.android.BatchPushService
+
+-keep class com.android.vending.billing.**
diff --git a/Android/EasyBudget/app/src/main/AndroidManifest.xml b/Android/EasyBudget/app/src/main/AndroidManifest.xml
@@ -23,14 +23,8 @@
     <uses-permission android:name="com.android.vending.BILLING"/>
 
     <!-- Push -->
-    <permission
-        android:name="com.benoitletondor.easybudgetapp.permission.C2D_MESSAGE"
-        android:protectionLevel="signature"/>
-
-    <uses-permission android:name="com.benoitletondor.easybudgetapp.permission.C2D_MESSAGE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
 
     <application
         android:name=".EasyBudget"
@@ -106,24 +100,13 @@
             android:theme="@style/AppThemeNoActionBar">
         </activity>
 
-        <!-- Batch SDK -->
-        <service android:name="com.batch.android.BatchPushService"/>
-
-        <receiver
-            android:name="com.batch.android.BatchPushReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-
-                <category android:name="com.benoitletondor.easybudgetapp"/>
-            </intent-filter>
-        </receiver>
-
+        <!-- Push -->
         <service
-            android:name="com.batch.android.BatchPushInstanceIDService"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.android.gms.iid.InstanceID"/>
+            android:name=".push.PushService"
+            tools:ignore="ExportedService">
+            <intent-filter
+                android:priority="999">
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
 
@@ -133,27 +116,11 @@
 
         <receiver android:name=".notif.AppUpdateBroadcastReceiver">
             <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED"/>
-
-                <data android:scheme="package"/>
-            </intent-filter>
-        </receiver>
-
-        <!-- Custom Push receiver -->
-        <service android:name=".push.PushService"/>
-
-        <receiver
-            android:name=".push.PushReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-
-                <category android:name="com.benoitletondor.easybudgetapp"/>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
             </intent-filter>
         </receiver>
 
         <!-- Analytics -->
-        <service android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
         <service
             android:name="com.google.android.gms.analytics.AnalyticsService"
             android:enabled="true"