From 1bba209bede1d0f6044109f44e68e6f22885218f Mon Sep 17 00:00:00 2001
From: houxg <houxg09@foxmail.com>
Date: Fri, 16 Dec 2016 19:25:55 +0800
Subject: [PATCH] integrate ugly

---
 app/build.gradle                                          | 3 ++-
 app/production.properties                                 | 1 +
 app/proguard-rules.pro                                    | 3 +++
 app/src/main/AndroidManifest.xml                          | 3 +++
 app/src/main/java/org/houxg/leamonax/Leamonax.java        | 6 ++----
 app/src/main/java/org/houxg/leamonax/ui/MainActivity.java | 3 ++-
 app/staging.properties                                    | 1 +
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 712beff..2b561a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,6 +61,7 @@ android {
             properties.load(new FileInputStream(new File(projectDir.absolutePath + "/production.properties")))
         }
         buildType.buildConfigField "String", "FLURRY_KEY", properties['FLURRY_KEY']
+        buildType.buildConfigField "String", "BUGLY_KEY", properties['BUGLY_KEY']
     }
 }
 
@@ -100,7 +101,7 @@ dependencies {
     compile project(':img-selector')
     compile 'com.facebook.stetho:stetho:1.4.1'
     compile 'com.github.houxg:FlexLayout:1.2'
-    compile 'com.flurry.android:analytics:6.4.2'
 
     compile 'net.danlew:android.joda:2.9.5'
+    compile 'com.tencent.bugly:crashreport:2.4.0'
 }
diff --git a/app/production.properties b/app/production.properties
index db81549..6632f1d 100644
--- a/app/production.properties
+++ b/app/production.properties
@@ -1 +1,2 @@
 FLURRY_KEY="M6HD6WJPT9Y274MG2FSF"
+BUGLY_KEY="cf1aa1ccff"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c11f525..8088729 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8046cb6..92b0117 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,9 @@
     <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
diff --git a/app/src/main/java/org/houxg/leamonax/Leamonax.java b/app/src/main/java/org/houxg/leamonax/Leamonax.java
index f1dcea7..aefb878 100644
--- a/app/src/main/java/org/houxg/leamonax/Leamonax.java
+++ b/app/src/main/java/org/houxg/leamonax/Leamonax.java
@@ -5,9 +5,9 @@ import android.app.Application;
 import android.content.Context;
 
 import com.facebook.stetho.Stetho;
-import com.flurry.android.FlurryAgent;
 import com.raizlabs.android.dbflow.config.FlowConfig;
 import com.raizlabs.android.dbflow.config.FlowManager;
+import com.tencent.bugly.crashreport.CrashReport;
 
 import net.danlew.android.joda.JodaTimeAndroid;
 
@@ -25,9 +25,7 @@ public class Leamonax extends Application {
     public void onCreate() {
         super.onCreate();
         mContext = this;
-        new FlurryAgent.Builder()
-                .withLogEnabled(true)
-                .build(this, BuildConfig.FLURRY_KEY);
+        CrashReport.initCrashReport(this, BuildConfig.BUGLY_KEY, BuildConfig.DEBUG);
         EventBus.builder()
                 .logNoSubscriberMessages(false)
                 .sendNoSubscriberEvent(false)
diff --git a/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
index ba525fe..d415fe3 100644
--- a/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
+++ b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
@@ -23,6 +23,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.tencent.bugly.crashreport.CrashReport;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -90,7 +91,7 @@ public class MainActivity extends BaseActivity implements NotebookAdapter.Notebo
         initToolBar((Toolbar) findViewById(R.id.toolbar));
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_menu_white);
-
+        CrashReport.setUserId(AccountService.getCurrent().getUserId());
         if (savedInstanceState == null) {
             mNoteFragment = NoteFragment.newInstance(getIntent().getBooleanExtra(EXT_SHOULD_RELOAD, false));
             getFragmentManager().beginTransaction().add(R.id.container, mNoteFragment, TAG_NOTE_FRAGMENT).commit();
diff --git a/app/staging.properties b/app/staging.properties
index 898b345..81a2165 100644
--- a/app/staging.properties
+++ b/app/staging.properties
@@ -1 +1,2 @@
 FLURRY_KEY="XQP2X5N9BCGB7Z5JHS28"
+BUGLY_KEY="747b676abf"