remove hockeyapp, add crashlytics support. read keys from keys.xml

quran · Oct 5, 2013 · 49dd0b6 · 49dd0b6
1 parent 2ea3068
commit 49dd0b6
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ classes
 ApiKeys.java
 .gradle
 */build
+app/src/release
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,22 @@
 buildscript {
     repositories {
         mavenCentral()
+        maven { url 'http://download.crashlytics.com/maven' }
+
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.5.+'
+        classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
+
     }
 }
 apply plugin: 'android'
+apply plugin: 'crashlytics'
 
 repositories {
     mavenCentral()
+    maven { url 'http://download.crashlytics.com/maven' }
+
 }
 
 android {
@@ -32,5 +39,6 @@ android {
 dependencies {
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.android.support:support-v4:18.0.0'
-    compile 'net.hockeyapp.android:HockeySDK:2.2.1'
+    compile 'com.crashlytics.android:crashlytics:1.+'
+
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -79,7 +79,8 @@
             </intent-filter>
        </service>
 
-       <activity android:name="net.hockeyapp.android.UpdateActivity" />
+      <meta-data android:name="com.crashlytics.ApiKey"
+                 android:value="@string/crashlytics_key"/>
 
    </application>
 </manifest> 
diff --git a/app/src/main/java/com/quran/labs/androidquran/QuranApplication.java b/app/src/main/java/com/quran/labs/androidquran/QuranApplication.java
@@ -5,10 +5,9 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+
+import com.crashlytics.android.Crashlytics;
 import com.quran.labs.androidquran.data.Constants;
-import com.quran.labs.androidquran.util.ApiKeys;
-import com.quran.labs.androidquran.util.QuranCrashListener;
-import net.hockeyapp.android.CrashManager;
 
 import java.util.Locale;
 
@@ -21,8 +20,7 @@ public class QuranApplication extends Application {
   public void onCreate() {
     super.onCreate();
     if (Constants.CRASH_REPORTING_ENABLED) {
-      CrashManager.register(this, ApiKeys.HOCKEY_APP_KEY,
-          QuranCrashListener.getInstance(this));
+      Crashlytics.start(this);
     }
     refreshLocale(false);
   }

diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/util/AyahMenuUtils.java b/app/src/main/java/com/quran/labs/androidquran/ui/util/AyahMenuUtils.java
@@ -124,13 +124,13 @@ private void showAyahMenu(final int sura, final int ayah,
          @Override
          public void onClick(DialogInterface dialog, int selection) {
             if (selection == 0) {
-               if (activity != null && activity instanceof PagerActivity){
+               if (activity instanceof PagerActivity){
                   PagerActivity pagerActivity = (PagerActivity) activity;
                   pagerActivity.toggleBookmark(sura, ayah, page);
                }
             }
             else if (selection == 1) {
-               if (activity != null && activity instanceof PagerActivity){
+               if (activity instanceof PagerActivity){
                   PagerActivity pagerActivity = (PagerActivity) activity;
                   FragmentManager fm =
                           pagerActivity.getSupportFragmentManager();
@@ -174,11 +174,13 @@ public void onCancel(DialogInterface dialogInterface) {
    }
 
    class ShareQuranApp extends AsyncTask<Integer, Void, String> {
+     private String mKey;
 
       @Override
       protected void onPreExecute() {
          Activity activity = getActivity();
          if (activity != null){
+            mKey = activity.getString(R.string.quranapp_key);
             mProgressDialog = new ProgressDialog(activity);
             mProgressDialog.setIndeterminate(true);
             mProgressDialog.setMessage(
@@ -200,8 +202,7 @@ protected String doInBackground(Integer... params){
                   endAyah = params[2];
                }
             }
-            url = QuranAppUtils.getQuranAppUrl(sura,
-                    startAyah, endAyah);
+            url = QuranAppUtils.getQuranAppUrl(mKey, sura, startAyah, endAyah);
          }
          return url;
       }

diff --git a/app/src/main/java/com/quran/labs/androidquran/util/ApiKeys.java b/app/src/main/java/com/quran/labs/androidquran/util/ApiKeys.java
diff --git a/app/src/main/java/com/quran/labs/androidquran/util/QuranAppUtils.java b/app/src/main/java/com/quran/labs/androidquran/util/QuranAppUtils.java
@@ -16,7 +16,8 @@
 public class QuranAppUtils {
    private static final String TAG = "QuranAppUtils";
 
-   public static String getQuranAppUrl(int sura, Integer startAyah,
+   public static String getQuranAppUrl(String key, int sura,
+                                       Integer startAyah,
                                        Integer endAyah){
       String url = null;
       String fallbackUrl = null;
@@ -33,7 +34,7 @@ public static String getQuranAppUrl(int sura, Integer startAyah,
             }
             else { params.put("end_ayah", startAyah.toString()); }
          }
-         params.put("key", ApiKeys.QURAN_APP_KEY);
+         params.put("key", key);
          String result = getQuranAppUrl(params);
          if (!TextUtils.isEmpty(result)){
             JSONObject json = new JSONObject(result);

diff --git a/app/src/main/java/com/quran/labs/androidquran/util/QuranCrashListener.java b/app/src/main/java/com/quran/labs/androidquran/util/QuranCrashListener.java
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="crashlytics_key">PLACE_YOUR_KEY_HERE</string>
+    <string name="quranapp_key">PLACE_YOUR_KEY_HERE</string>
+</resources>