From 567d4be0eef88898d144b5abcc67ec8e76006b6d Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Wed, 25 Nov 2015 11:10:15 +0100 Subject: [PATCH] update patch for pebbledialer and reenable --- metadata/com.matejdro.pebbledialer.txt | 3 +- ...shlytics_and_internet_permission_2.52.diff | 156 ++++++++++++++++++ 2 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 metadata/com.matejdro.pebbledialer/remove_crashlytics_and_internet_permission_2.52.diff diff --git a/metadata/com.matejdro.pebbledialer.txt b/metadata/com.matejdro.pebbledialer.txt index 1c272c4216..6bfffe376b 100644 --- a/metadata/com.matejdro.pebbledialer.txt +++ b/metadata/com.matejdro.pebbledialer.txt @@ -53,10 +53,9 @@ Build:2.42,26 prebuild=sed -i 's_../PebbleAndroidCommons_app/$$AndroidPebbleCommons$$_' ../settings.gradle Build:2.52,28 - disable=patch does not apply commit=2.52 subdir=app - patch=remove_crashlytics_and_internet_permission_2.41.diff + patch=remove_crashlytics_and_internet_permission_2.52.diff gradle=yes srclibs=AndroidPebbleCommons@r5 prebuild=sed -i 's_../PebbleAndroidCommons_app/$$AndroidPebbleCommons$$_' ../settings.gradle diff --git a/metadata/com.matejdro.pebbledialer/remove_crashlytics_and_internet_permission_2.52.diff b/metadata/com.matejdro.pebbledialer/remove_crashlytics_and_internet_permission_2.52.diff new file mode 100644 index 0000000000..e60a0bab76 --- /dev/null +++ b/metadata/com.matejdro.pebbledialer/remove_crashlytics_and_internet_permission_2.52.diff @@ -0,0 +1,156 @@ +diff --git a/app/build.gradle b/app/build.gradle +index 3dc26b8..f7dc30b 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 { +@@ -35,7 +21,6 @@ android { + + dependencies { + compile 'com.android.support:appcompat-v7:23.1.0' +- compile 'com.crashlytics.android:crashlytics:1.+' + compile project(':PebbleAndroidCommons') + compile('de.psdev.licensesdialog:licensesdialog:1.8.0') + } +diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml +index ab7bb30..d4041c2 100644 +--- a/app/src/main/AndroidManifest.xml ++++ b/app/src/main/AndroidManifest.xml +@@ -11,7 +11,6 @@ + + + +- + + + +diff --git a/app/src/main/java/com/matejdro/pebbledialer/PebbleDialerApplication.java b/app/src/main/java/com/matejdro/pebbledialer/PebbleDialerApplication.java +index 23efad9..573baff 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", this); + +- 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 83fc210..ee815ee 100644 +--- a/app/src/main/java/com/matejdro/pebbledialer/modules/SMSReplyModule.java ++++ b/app/src/main/java/com/matejdro/pebbledialer/modules/SMSReplyModule.java +@@ -15,7 +15,6 @@ import android.support.v4.content.ContextCompat; + 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; +@@ -116,7 +115,6 @@ public class SMSReplyModule extends CommModule implements MessageTextProviderLis + + if (number == null) + { +- Crashlytics.logException(new NullPointerException("Number is null!")); + sendFailNotification(); + return; + } +@@ -209,10 +207,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; + } +@@ -234,7 +228,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/" } + } + }