Merge branch 'master' into 'master'

Update Dialer for Pebble to 2.41



See merge request !1021

metadata/com.matejdro.pebbledialer.txt

@@ -36,6 +36,15 @@ Build:2.4,24
     srclibs=AndroidPebbleCommons@9e3017a233a1a1e7d06354e064068c30dcf5288f
     prebuild=sed -i 's_../PebbleAndroidCommons_app/$$AndroidPebbleCommons$$_' ../settings.gradle
 
+Build:2.41,25
+    commit=2.41
+    subdir=app
+    patch=remove_crashlytics_and_internet_permission_2.41.diff
+    gradle=yes
+    srclibs=AndroidPebbleCommons@r1
+    prebuild=sed -i 's_../PebbleAndroidCommons_app/$$AndroidPebbleCommons$$_' ../settings.gradle
+
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.4

metadata/com.matejdro.pebbledialer/remove_crashlytics_and_internet_permission_2.41.diff

@@ -0,0 +1,155 @@
+diff --git a/app/build.gradle b/app/build.gradle
+index 7204bf2..864031c 100644
+--- a/app/build.gradle
++++ b/app/build.gradle
+@@ -1,18 +1,4 @@
+-buildscript {
+-    repositories {
+-        maven { url 'http://download.crashlytics.com/maven' }
+-    }
+-
+-    dependencies {
+-        classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
+-    }
+-}
+ apply plugin: 'com.android.application'
+-apply plugin: 'crashlytics'
+-
+-repositories {
+-    maven { url 'http://download.crashlytics.com/maven' }
+-}
+ 
+ 
+ android {
+@@ -34,6 +20,5 @@ android {
+ }
+ 
+ dependencies {
+-    compile 'com.crashlytics.android:crashlytics:1.+'
+     compile project(':PebbleAndroidCommons')
+ }
+diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
+index eefb0ae..49ea528 100644
+--- a/app/src/main/AndroidManifest.xml
++++ b/app/src/main/AndroidManifest.xml
+@@ -11,7 +11,6 @@
+     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+-    <uses-permission android:name="android.permission.INTERNET" />
+     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
+     <uses-permission android:name="android.permission.READ_CALL_LOG" />
+     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+diff --git a/app/src/main/java/com/matejdro/pebbledialer/PebbleDialerApplication.java b/app/src/main/java/com/matejdro/pebbledialer/PebbleDialerApplication.java
+index 7626800..3d16608 100644
+--- a/app/src/main/java/com/matejdro/pebbledialer/PebbleDialerApplication.java
++++ b/app/src/main/java/com/matejdro/pebbledialer/PebbleDialerApplication.java
+@@ -4,7 +4,6 @@ import android.content.SharedPreferences;
+ import android.content.pm.ApplicationInfo;
+ import android.preference.PreferenceManager;
+ 
+-import com.crashlytics.android.Crashlytics;
+ import com.matejdro.pebblecommons.PebbleCompanionApplication;
+ import com.matejdro.pebblecommons.pebble.PebbleTalkerService;
+ import com.matejdro.pebblecommons.util.LogWriter;
+@@ -27,10 +26,6 @@ public class PebbleDialerApplication extends PebbleCompanionApplication
+         Timber.plant(new Timber.AppTaggedDebugTree());
+         LogWriter.init(preferences, "PebbleDialer");
+ 
+-        boolean isDebuggable =  ( 0 != ( getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE ) );
+-        if (!isDebuggable)
+-            Crashlytics.start(this);
+-
+         super.onCreate();
+     }
+ 
+diff --git a/app/src/main/java/com/matejdro/pebbledialer/callactions/EndCallAction.java b/app/src/main/java/com/matejdro/pebbledialer/callactions/EndCallAction.java
+index 3d34892..986e8a8 100644
+--- a/app/src/main/java/com/matejdro/pebbledialer/callactions/EndCallAction.java
++++ b/app/src/main/java/com/matejdro/pebbledialer/callactions/EndCallAction.java
+@@ -5,7 +5,6 @@ import android.content.Context;
+ import android.telephony.TelephonyManager;
+ 
+ import com.android.internal.telephony.ITelephony;
+-import com.crashlytics.android.Crashlytics;
+ import com.matejdro.pebbledialer.modules.CallModule;
+ 
+ import java.io.IOException;
+@@ -31,7 +30,6 @@ public class EndCallAction extends CallAction
+             Timber.e(e, "iTelephony end not supported on your phone!");
+         } catch (Exception e) {
+             Timber.e(e, "Error while acquiring iTelephony");
+-            Crashlytics.logException(e);
+         }
+ 
+     }
+@@ -77,7 +75,6 @@ public class EndCallAction extends CallAction
+                 return;
+             } catch (Exception e) {
+                 Timber.e(e, "Error while invoking iTelephony.endCall()");
+-                Crashlytics.logException(e);
+             }
+         }
+ 
+diff --git a/app/src/main/java/com/matejdro/pebbledialer/callactions/SMSReplyAction.java b/app/src/main/java/com/matejdro/pebbledialer/callactions/SMSReplyAction.java
+index d3242cd..339059c 100644
+--- a/app/src/main/java/com/matejdro/pebbledialer/callactions/SMSReplyAction.java
++++ b/app/src/main/java/com/matejdro/pebbledialer/callactions/SMSReplyAction.java
+@@ -5,7 +5,6 @@ import android.content.Context;
+ import android.telephony.TelephonyManager;
+ 
+ import com.android.internal.telephony.ITelephony;
+-import com.crashlytics.android.Crashlytics;
+ import com.matejdro.pebbledialer.modules.CallModule;
+ import com.matejdro.pebbledialer.modules.SMSReplyModule;
+ 
+diff --git a/app/src/main/java/com/matejdro/pebbledialer/modules/SMSReplyModule.java b/app/src/main/java/com/matejdro/pebbledialer/modules/SMSReplyModule.java
+index 7faba5d..8808857 100644
+--- a/app/src/main/java/com/matejdro/pebbledialer/modules/SMSReplyModule.java
++++ b/app/src/main/java/com/matejdro/pebbledialer/modules/SMSReplyModule.java
+@@ -10,7 +10,6 @@ import android.support.v4.app.NotificationCompat;
+ import android.telephony.SmsManager;
+ import android.util.Log;
+ 
+-import com.crashlytics.android.Crashlytics;
+ import com.getpebble.android.kit.util.PebbleDictionary;
+ import com.matejdro.pebblecommons.messages.MessageTextProvider;
+ import com.matejdro.pebblecommons.messages.MessageTextProviderListener;
+@@ -112,7 +111,6 @@ public class SMSReplyModule extends CommModule implements MessageTextProviderLis
+         number = null;
+         if (number == null)
+         {
+-            Crashlytics.logException(new NullPointerException("Number is null!"));
+             sendFailNotification();
+             return;
+         }
+@@ -192,10 +190,6 @@ public class SMSReplyModule extends CommModule implements MessageTextProviderLis
+ 
+         if (number == null || text == null)
+         {
+-            Crashlytics.setBool("numberNull", number == null);
+-            Crashlytics.setBool("textNull", text == null);
+-
+-            Crashlytics.logException(new NullPointerException("gotText Null!"));
+             sendFailNotification();
+             return;
+         }
+@@ -217,7 +211,6 @@ public class SMSReplyModule extends CommModule implements MessageTextProviderLis
+             catch (Exception e)
+             {
+                 e.printStackTrace();
+-                Crashlytics.logException(e);
+             }
+         }
+     }
+diff --git a/build.gradle b/build.gradle
+index af1b6c6..e26cdee 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -11,6 +11,5 @@ buildscript {
+ allprojects {
+     repositories {
+         jcenter()
+-        maven { url "https://oss.sonatype.org/content/groups/public/" }
+     }
+ }