Merge branch 'release/1.6.4'

Android/EasyBudget/app/build.gradle

@@ -20,7 +20,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.25.4'
+        classpath 'io.fabric.tools:gradle:1.27.0'
     }
 }
 
@@ -31,19 +31,20 @@ apply from: 'batch.gradle'
 apply from: 'iap.gradle'
 
 repositories {
+    google()
     maven { url 'https://maven.fabric.io/public' }
     maven { url "http://maven.batch.com/release" }
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.benoitletondor.easybudgetapp"
         minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 48
-        versionName "1.6.2"
+        targetSdkVersion 28
+        versionCode 50
+        versionName "1.6.4"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -71,21 +72,20 @@ android {
 }
 
 dependencies {
-    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.3'
-    implementation 'com.google.android.gms:play-services-appinvite:16.0.3'
-    implementation 'com.google.firebase:firebase-core:16.0.3'
-    implementation 'com.google.firebase:firebase-messaging:17.3.2'
-    implementation 'com.android.billingclient:billing:1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.percentlayout:percentlayout:1.0.0'
+    implementation 'com.google.android.gms:play-services-analytics:16.0.7'
+    implementation 'com.google.firebase:firebase-core:16.0.7'
+    implementation 'com.google.firebase:firebase-messaging:17.3.4'
+    implementation 'com.android.billingclient:billing:1.2'
     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'
+    implementation('com.crashlytics.sdk.android:crashlytics:2.9.9@aar') { transitive = true }
+    implementation 'com.batch.android:batch-sdk:1.13.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/EasyBudget.java

@@ -23,14 +23,14 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AlertDialog;
 
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
@@ -54,7 +54,6 @@
 import com.benoitletondor.easybudgetapp.view.SettingsActivity;
 import com.crashlytics.android.Crashlytics;
 import com.google.android.gms.analytics.GoogleAnalytics;
-import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
 import java.net.URLEncoder;
@@ -148,34 +147,6 @@ public void onCreate()
         setupIab();
     }
 
-    /**
-     * Track that user comes from the given invitation id
-     *
-     * @param invitationId
-     */
-    public void trackInvitationId(String invitationId)
-    {
-        analyticsTracker.send(new HitBuilders.ScreenViewBuilder()
-                .setCustomDimension(1, "referral-appinvites")
-                .build());
-    }
-
-    /**
-     * Track the number of invites sent by the user
-     *
-     * @param invitationsSent
-     */
-    public void trackNumberOfInvitsSent(int invitationsSent)
-    {
-        int invitSent = Parameters.getInstance(getApplicationContext()).getInt(ParameterKeys.NUMBER_OF_INVITATIONS, 0);
-        invitSent += invitationsSent;
-        Parameters.getInstance(getApplicationContext()).putInt(ParameterKeys.NUMBER_OF_INVITATIONS, invitSent);
-
-        analyticsTracker.send(new HitBuilders.ScreenViewBuilder()
-                .setCustomMetric(1, (float) invitSent)
-                .build());
-    }
-
     /**
      * Init app const and parameters
      */
@@ -697,6 +668,8 @@ private void updateIAPStatusIfNeeded()
         {
             setIabStatusAndNotify(PremiumCheckStatus.CHECKING);
             iabHelper.queryPurchaseHistoryAsync(BillingClient.SkuType.INAPP, this);
+        } else if ( iabStatus == PremiumCheckStatus.ERROR ) {
+            setupIab();
         }
     }
 
@@ -774,6 +747,12 @@ public void onPurchasesUpdated(@BillingClient.BillingResponse int responseCode,
             {
                 listener.onUserCancelled();
             }
+            else if( responseCode == BillingClient.BillingResponse.ITEM_ALREADY_OWNED )
+            {
+                setIabStatusAndNotify(PremiumCheckStatus.PREMIUM);
+                listener.onPurchaseSuccess();
+                return;
+            }
             else
             {
                 listener.onPurchaseError("An error occurred (status code: "+responseCode+")");
@@ -827,7 +806,9 @@ public void onBillingSetupFinished(@BillingClient.BillingResponse int responseCo
     @Override
     public void onBillingServiceDisconnected()
     {
-        // TODO ?
+        Logger.debug("onBillingServiceDisconnected");
+
+        setIabStatusAndNotify(PremiumCheckStatus.ERROR);
     }
 
     @Override

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/PremiumPurchaseListener.java

@@ -16,10 +16,6 @@
 
 package com.benoitletondor.easybudgetapp;
 
-import android.support.annotation.NonNull;
-
-import com.android.billingclient.api.BillingClient;
-
 /**
  * Listener for in-app purchase buying flow
  *

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/ReferrerReceiver.java

@@ -19,12 +19,8 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
-import android.support.v4.content.LocalBroadcastManager;
 
-import com.benoitletondor.easybudgetapp.view.MainActivity;
 import com.google.android.gms.analytics.CampaignTrackingReceiver;
-import com.google.android.gms.appinvite.AppInviteReferral;
 
 /**
  * A receiver for referrer intents
@@ -38,12 +34,5 @@ public void onReceive(Context context, Intent intent)
     {
         // Forward to Google analytics
         new CampaignTrackingReceiver().onReceive(context, intent);
-
-        // Create deep link intent with correct action and add play store referral information
-        Intent refIntent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse(MainActivity.buildAppInvitesReferrerDeeplink(context)));
-
-        Intent deepLinkIntent = AppInviteReferral.addPlayStoreReferrerToIntent(intent, refIntent);
-        LocalBroadcastManager.getInstance(context).sendBroadcast(deepLinkIntent);
     }
 }

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/helper/CurrencyHelper.java

@@ -18,11 +18,10 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.benoitletondor.easybudgetapp.BuildConfig;
 
-import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,11 +45,6 @@ public class CurrencyHelper
      */
     private static final String[] MAIN_CURRENCIES = {"USD", "EUR", "GBP", "IRN", "AUD", "CAD", "SGD", "CHF", "MYR", "JPY", "CNY", "NZD"};
 
-    /**
-     * Static formatter, that should be used with a synchronized block
-     */
-    private static final DecimalFormat decimalFormatter = new DecimalFormat("#.00");
-
 // ----------------------------------------->
 
     /**

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/helper/DateHelper.java

@@ -17,8 +17,8 @@
 package com.benoitletondor.easybudgetapp.helper;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.util.Pair;
+import androidx.annotation.NonNull;
+import androidx.core.util.Pair;
 
 import com.benoitletondor.easybudgetapp.R;
 

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/helper/ParameterKeys.java

@@ -55,10 +55,6 @@ public class ParameterKeys
      * Number of invitations sent by the user (int)
      */
     public static final String NUMBER_OF_INVITATIONS = "number_of_invitations";
-    /**
-     * ID of the invitation the user came with (String)
-     */
-    public static final String INVITATION_ID = "invitation_id";
     /**
      * Source of the installation (String)
      */

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/helper/Parameters.java

@@ -18,8 +18,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Singleton to manage parameters into the app (wrapper of SharedPreferences).

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/helper/UIHelper.java

@@ -22,11 +22,11 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Gravity;

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/helper/UserHelper.java

@@ -18,7 +18,7 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import com.roomorama.caldroid.CaldroidFragment;
 
 import static com.benoitletondor.easybudgetapp.helper.ParameterKeys.FIRST_DAY_OF_WEEK;

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/model/Expense.java

@@ -18,8 +18,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.benoitletondor.easybudgetapp.helper.DateHelper;
 

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/model/RecurringExpense.java

@@ -18,7 +18,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.benoitletondor.easybudgetapp.helper.DateHelper;
 

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/model/RecurringExpenseDeleteType.java

@@ -16,7 +16,7 @@
 
 package com.benoitletondor.easybudgetapp.model;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * An enum that reference different kind of deletion for a recurring expense

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/model/db/DB.java

@@ -21,10 +21,10 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v4.util.Pair;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.util.Pair;
 
 import com.benoitletondor.easybudgetapp.helper.CurrencyHelper;
 import com.benoitletondor.easybudgetapp.helper.DateHelper;

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/model/db/DBCache.java

@@ -17,9 +17,9 @@
 package com.benoitletondor.easybudgetapp.model.db;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.SimpleArrayMap;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.SimpleArrayMap;
 
 import com.benoitletondor.easybudgetapp.helper.DateHelper;
 import com.benoitletondor.easybudgetapp.helper.Logger;

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/model/db/SQLiteDBHelper.java

@@ -19,7 +19,7 @@
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.benoitletondor.easybudgetapp.model.RecurringExpenseType;
 

Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/notif/DailyNotifOptinService.java

@@ -20,10 +20,10 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.ContextCompat;
 
 import com.benoitletondor.easybudgetapp.R;
 import com.benoitletondor.easybudgetapp.helper.Logger;