Merge pull request #3 from ebaschiera/feature/piwik-tracking

Feature/piwik tracking
ebaschiera · Jul 19, 2015 · f9e9b2e · f9e9b2e
2 parents 77b8d70 + 845f11b
commit f9e9b2e
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 8 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TripleCamel" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="TripleCamel" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -87,6 +87,7 @@
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="PiwikAndroidSdk" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
   </component>

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.ebaschiera.triplecamel"
         minSdkVersion 10
         targetSdkVersion 21
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 4
+        versionName "1.0.3"
     }
     buildTypes {
         release {
@@ -20,7 +20,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:support-v4:21.0.3'
+    compile files('libs/PiwikAndroidSdk.jar')
 }
diff --git a/app/libs/PiwikAndroidSdk.jar b/app/libs/PiwikAndroidSdk.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ebaschiera.triplecamel"
-    android:versionCode="2"
-    android:versionName="1.0.1">
+    android:versionCode="4"
+    android:versionName="1.0.3">
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
+        android:name="TripleCamelApp"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/com/ebaschiera/triplecamel/MainActivity.java b/app/src/main/java/com/ebaschiera/triplecamel/MainActivity.java
@@ -18,6 +18,8 @@ public class MainActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        ((TripleCamelApp) getApplication()).getTracker()
+                .trackScreenView("/info_screen", "Info screen");
     }
 
     /**

diff --git a/app/src/main/java/com/ebaschiera/triplecamel/ShareActivity.java b/app/src/main/java/com/ebaschiera/triplecamel/ShareActivity.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.content.Context;
 import android.net.Uri;
-import android.util.Log;
 import android.content.pm.*;
 import android.widget.Toast;
 import java.util.regex.*;
@@ -21,6 +20,9 @@ public class ShareActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        ((TripleCamelApp) getApplication()).getTracker()
+                .trackScreenView("/share", "Share intent");
+
         // Get the intent that started this activity
         Intent intent = getIntent();
         Uri data = intent.getData();
@@ -37,6 +39,7 @@ protected void onCreate(Bundle savedInstanceState) {
             }
             if (amazon_share_url == "") {
                 //return a warning and stop the intent
+                ((TripleCamelApp) getApplication()).getTracker().trackEvent("share", "failed", "label", 1);
                 Context context = getApplicationContext();
                 String text = getResources().getString(R.string.amazon_link_not_matching);
                 int duration = Toast.LENGTH_LONG;
@@ -55,11 +58,13 @@ protected void onCreate(Bundle savedInstanceState) {
             List<ResolveInfo> activities = packageManager.queryIntentActivities(webIntent, 0);
             boolean isIntentSafe = activities.size() > 0;
 
-// Start an activity if it's safe
+            // Start an activity if it's safe
             if (isIntentSafe) {
+                ((TripleCamelApp) getApplication()).getTracker().trackEvent("share", "successful", "label", 1);
                 startActivity(webIntent);
                 finish();
             } else {
+                ((TripleCamelApp) getApplication()).getTracker().trackEvent("share", "failed", "label", 1);
                 Context context = getApplicationContext();
                 String text = getResources().getString(R.string.no_web_browser);
                 int duration = Toast.LENGTH_LONG;
@@ -69,6 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
             }
         } else {
             //return a warning and stop the intent
+            ((TripleCamelApp) getApplication()).getTracker().trackEvent("share", "failed", "label", 1);
             Context context = getApplicationContext();
             String text = getResources().getString(R.string.amazon_link_not_matching);
             int duration = Toast.LENGTH_LONG;

diff --git a/app/src/main/java/com/ebaschiera/triplecamel/TripleCamelApp.java b/app/src/main/java/com/ebaschiera/triplecamel/TripleCamelApp.java
@@ -0,0 +1,20 @@
+package com.ebaschiera.triplecamel;
+
+import org.piwik.sdk.PiwikApplication;
+
+/**
+ * Created by ebaschiera on 19/07/15.
+ */
+public class TripleCamelApp extends PiwikApplication {
+
+    @Override
+    public String getTrackerUrl() {
+        return "http://ebaschiera.com/piwik/piwik.php";
+    }
+
+    @Override
+    public Integer getSiteId() {
+        return 1;
+    }
+
+}