Merge pull request #226 from Glucosio/develop

Releasing Glucosio 0.12.0

Author: Paolo Rotolo

app/build.gradle

@@ -32,8 +32,9 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 19
-        versionName '0.11.0'
+        versionCode 20
+        versionName '0.12.0'
+        applicationId "org.glucosio.android"
 
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
@@ -102,20 +103,13 @@ dependencies {
     compile "com.google.android.gms:play-services-wearable:${googlePlayServicesVer}"
     compile "com.google.android.gms:play-services-gcm:${googlePlayServicesVer}"
 
-    //Smooch
-    compile 'com.google.code.gson:gson:2.4'
-    compile 'com.squareup.okhttp:okhttp:2.4.0'
-    compile 'io.smooch:core:latest.release'
-    compile 'io.smooch:ui:latest.release'
-
-
     // Other libraries
-    compile 'com.github.clans:fab:1.6.2'
-    compile 'com.wdullaer:materialdatetimepicker:2.2.0'
-    compile 'com.github.PhilJay:MPAndroidChart:v2.2.3'
+    compile 'com.github.clans:fab:1.6.3'
+    compile 'com.wdullaer:materialdatetimepicker:2.3.0'
+    compile 'com.github.PhilJay:MPAndroidChart:v2.2.4'
     compile 'uk.co.chrisjenx:calligraphy:2.1.0'
-    compile 'net.danlew:android.joda:2.9.2'
-    compile('com.mikepenz:materialdrawer:5.0.5@aar') {
+    compile 'net.danlew:android.joda:2.9.3'
+    compile('com.mikepenz:materialdrawer:5.2.1@aar') {
         transitive = true
     }
 
@@ -147,4 +141,4 @@ configurations.all {
     resolutionStrategy.force "com.android.support:design:${androidSupportVer}"
     resolutionStrategy.force "com.android.support:appcompat-v7:${androidSupportVer}"
 }
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'

app/google-services.json

@@ -23,6 +23,10 @@
             "package_name": "org.glucosio.android",
             "certificate_hash": "A18AA65A6EFE7F0DE3BA409A02EA6703E21CFEFD"
           }
+        },
+        {
+          "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
+          "client_type": 3
         }
       ],
       "api_key": [],
@@ -39,10 +43,15 @@
         },
         "appinvite_service": {
           "status": 2,
-          "other_platform_oauth_client": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
         },
         "google_signin_service": {
-          "status": 1
+          "status": 2
         },
         "ads_service": {
           "status": 1
@@ -67,6 +76,10 @@
             "package_name": "org.glucosio.android.daily",
             "certificate_hash": "9DF65CBC6293EB82523180CAF03912C6CC301FBD"
           }
+        },
+        {
+          "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
+          "client_type": 3
         }
       ],
       "api_key": [],
@@ -80,7 +93,12 @@
         },
         "appinvite_service": {
           "status": 2,
-          "other_platform_oauth_client": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "45702392997-75lumfd1jtpvd7n2q7sac4ebrsjfcbp6.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
         },
         "google_signin_service": {
           "status": 1

app/src/main/AndroidManifest.xml

@@ -71,7 +71,7 @@
             android:theme="@style/GlucosioSettings" />
         <activity
             android:name=".activity.BackupActivity"
-            android:label="@string/title_activity_backup"
+            android:label="@string/title_activity_backup_drive"
             android:parentActivityName=".activity.PreferencesActivity"
             android:theme="@style/GlucosioSettings">
             <meta-data
@@ -83,6 +83,7 @@
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.provider.fileprovider"
             android:exported="false"
+            android:readPermission="${applicationId}.provider.fileprovider.READ"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"

app/src/main/java/org/glucosio/android/GlucosioApplication.java

@@ -34,7 +34,6 @@
 import org.glucosio.android.invitations.GoogleInvitation;
 import org.glucosio.android.invitations.Invitation;
 
-import io.smooch.core.Smooch;
 import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
 public class GlucosioApplication extends Application {
@@ -45,9 +44,6 @@ public class GlucosioApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        // Initialize Smooch
-        Smooch.init(this, "dxopifgi0mylv4invg5lrb66r");
-
         // Get Dyslexia preference and adjust font
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
         boolean isDyslexicModeOn = sharedPref.getBoolean("pref_font_dyslexia", false);

app/src/main/java/org/glucosio/android/activity/AboutActivity.java

@@ -28,14 +28,14 @@
 import android.preference.PreferenceFragment;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import org.glucosio.android.GlucosioApplication;
 import org.glucosio.android.R;
 import org.glucosio.android.analytics.Analytics;
 
 import java.util.Locale;
 
-import io.smooch.ui.ConversationActivity;
 import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
 
 public class AboutActivity extends AppCompatActivity {
@@ -119,7 +119,15 @@ public boolean onPreferenceClick(Preference preference) {
             feedbackPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                    ConversationActivity.show(getActivity());
+                    // Open email intent
+                    Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:[email protected]"));
+                    boolean activityExists = emailIntent.resolveActivityInfo(getActivity().getPackageManager(), 0) != null;
+
+                    if (activityExists) {
+                        startActivity(emailIntent);
+                    } else {
+                        Toast.makeText(getActivity().getApplicationContext(),getResources().getString(R.string.menu_support_error1), Toast.LENGTH_LONG).show();
+                    }
 
                     return false;
                 }