summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2014-12-06 14:06:00 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2014-12-06 14:06:00 +0100
commitbb59449fbcbb46ba018313c51150924e7aec3be0 (patch)
tree7dc632b301f26f59e9ef83daaa566d929a15791b /app/src
parent2d887e4226d60347a97518c8efafa507d7ab7bed (diff)
downloadfiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.tar.gz
fiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.tar.bz2
fiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.tar.xz
fiken-display-android-bb59449fbcbb46ba018313c51150924e7aec3be0.zip
o Upgrading gadle.
o Adding crashlytics.
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/AndroidManifest.xml3
-rw-r--r--app/src/main/java/no/topi/fiken/display/MainActivity.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 35956d8..14c5ba9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,8 @@
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.INTERNET"/>
+
<!--
<application android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
@@ -51,6 +53,7 @@
<service
android:name=".DefaultDisplayService"
android:enabled="true" />
+ <meta-data android:name="com.crashlytics.ApiKey" android:value="cf760ececcb6d74c66781b3e21ae115aaae3ffd3"/>
</application>
</manifest>
diff --git a/app/src/main/java/no/topi/fiken/display/MainActivity.java b/app/src/main/java/no/topi/fiken/display/MainActivity.java
index 6c21afe..4f94784 100644
--- a/app/src/main/java/no/topi/fiken/display/MainActivity.java
+++ b/app/src/main/java/no/topi/fiken/display/MainActivity.java
@@ -25,6 +25,8 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
+import com.crashlytics.android.Crashlytics;
+import io.fabric.sdk.android.Fabric;
import java.util.ArrayList;
import java.util.List;
@@ -55,6 +57,7 @@ public class MainActivity extends ListActivity {
Log.i(TAG, "onCreate");
Thread.setDefaultUncaughtExceptionHandler(EXCEPTION_HANDLER);
super.onCreate(savedInstanceState);
+ Fabric.with(this, new Crashlytics());
ActionBar actionBar = getActionBar();
if (actionBar != null) {