-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moves all the Google Analytics code into the google variant and adds a floss variant that avoids any non-free libraries. Closes: #279
- Loading branch information
Showing
32 changed files
with
347 additions
and
215 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
app/src/floss/java/fi/bitrite/android/ws/WSAndroidApplication.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package fi.bitrite.android.ws; | ||
|
||
import fi.bitrite.android.ws.di.AppInjector; | ||
|
||
public class WSAndroidApplication extends BaseWSAndroidApplication { | ||
protected AppInjector inject() { | ||
return AppInjector.create(this); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
app/src/floss/java/fi/bitrite/android/ws/repository/SettingsRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package fi.bitrite.android.ws.repository; | ||
|
||
import android.content.Context; | ||
|
||
import javax.inject.Inject; | ||
|
||
import fi.bitrite.android.ws.di.AppScope; | ||
|
||
@AppScope | ||
public class SettingsRepository extends BaseSettingsRepository { | ||
|
||
@Inject | ||
SettingsRepository(Context context) { | ||
super(context); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package fi.bitrite.android.ws.util; | ||
|
||
import android.content.Context; | ||
|
||
/** | ||
* General simple tools, mostly public methods. | ||
*/ | ||
public class Tools extends BaseTools { | ||
|
||
// Send a report to Google Analytics about category/action | ||
static public void gaReportException(Context context, String category, String action) { | ||
// This just does nothing. | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="app_version">Version %1$s (FLOSS)</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="app_version">Versión %1$s (FLOSS)</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="app_version">Version %1$s (FLOSS)</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="app_version">Version %1$s (FLOSS)</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
package="fi.bitrite.android.ws"> | ||
|
||
<application> | ||
<meta-data | ||
android:name="com.google.android.gms.version" | ||
android:value="@integer/google_play_services_version" /> | ||
</application> | ||
</manifest> |
55 changes: 55 additions & 0 deletions
55
app/src/google/java/fi/bitrite/android/ws/WSAndroidApplication.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
package fi.bitrite.android.ws; | ||
|
||
import com.google.android.gms.analytics.GoogleAnalytics; | ||
import com.google.android.gms.analytics.Tracker; | ||
|
||
import java.util.HashMap; | ||
|
||
import javax.inject.Inject; | ||
|
||
import fi.bitrite.android.ws.di.AppInjector; | ||
import fi.bitrite.android.ws.repository.SettingsRepository; | ||
|
||
public class WSAndroidApplication extends BaseWSAndroidApplication { | ||
|
||
@Inject SettingsRepository mSettingsRepository; | ||
|
||
private final HashMap<TrackerName, Tracker> mTrackers = new HashMap<>(); | ||
|
||
public synchronized Tracker getTracker(TrackerName trackerId) { | ||
final String TRACKING_ID = getString(R.string.ga_tracking_id); | ||
|
||
if (!mTrackers.containsKey(trackerId)) { | ||
|
||
GoogleAnalytics analytics = GoogleAnalytics.getInstance(this); | ||
Tracker t = (trackerId == TrackerName.APP_TRACKER) | ||
? analytics.newTracker(R.xml.app_tracker) | ||
: (trackerId == TrackerName.GLOBAL_TRACKER) | ||
? analytics.newTracker(R.xml.global_tracker) | ||
: analytics.newTracker(TRACKING_ID); | ||
mTrackers.put(trackerId, t); | ||
} | ||
return mTrackers.get(trackerId); | ||
} | ||
|
||
public void onCreate() { | ||
super.onCreate(); | ||
|
||
// Set automatic activity reports, per http://stackoverflow.com/a/24983778/215713 | ||
GoogleAnalytics analytics = GoogleAnalytics.getInstance(this); | ||
analytics.enableAutoActivityReports(this); | ||
analytics.setAppOptOut(!mSettingsRepository.canCollectStats()); | ||
} | ||
|
||
@Override | ||
protected AppInjector inject() { | ||
return AppInjector.create(this); | ||
} | ||
|
||
|
||
// Google Analytics Support | ||
public enum TrackerName { | ||
APP_TRACKER, | ||
GLOBAL_TRACKER | ||
} | ||
} |
31 changes: 31 additions & 0 deletions
31
app/src/google/java/fi/bitrite/android/ws/repository/SettingsRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package fi.bitrite.android.ws.repository; | ||
|
||
import android.content.Context; | ||
import android.content.res.Resources; | ||
|
||
import javax.inject.Inject; | ||
|
||
import fi.bitrite.android.ws.R; | ||
import fi.bitrite.android.ws.di.AppScope; | ||
|
||
@AppScope | ||
public class SettingsRepository extends BaseSettingsRepository { | ||
private final String mKeyGaCollectStats; | ||
private final boolean mDefaultGaCollectStats; | ||
|
||
@Inject | ||
SettingsRepository(Context context) { | ||
super(context); | ||
|
||
final Resources res = context.getResources(); | ||
mKeyGaCollectStats = res.getString(R.string.prefs_ga_collect_stats_key); | ||
mDefaultGaCollectStats = res.getBoolean(R.bool.prefs_ga_collect_stats_default); | ||
} | ||
|
||
public boolean canCollectStats() { | ||
return mSharedPreferences.getBoolean(mKeyGaCollectStats, mDefaultGaCollectStats); | ||
} | ||
public String getCanCollectStatsKey() { | ||
return mKeyGaCollectStats; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package fi.bitrite.android.ws.util; | ||
|
||
import android.content.Context; | ||
|
||
import com.google.android.gms.analytics.HitBuilders; | ||
import com.google.android.gms.analytics.Tracker; | ||
|
||
import fi.bitrite.android.ws.WSAndroidApplication; | ||
|
||
/** | ||
* General simple tools, mostly public methods. | ||
*/ | ||
public class Tools extends BaseTools { | ||
|
||
// Send a report to Google Analytics about category/action | ||
static public void gaReportException(Context context, String category, String action) { | ||
|
||
Tracker exceptionTracker = ((WSAndroidApplication) context.getApplicationContext()) | ||
.getTracker(WSAndroidApplication.TrackerName.APP_TRACKER); | ||
|
||
exceptionTracker.send(new HitBuilders.EventBuilder() | ||
.setCategory(category) | ||
.setAction(action) | ||
.build() | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="prefs_ga_collect_stats_title">Anonyme Benutzungsstatistiken senden</string> | ||
<string name="prefs_ga_collect_stats_summary_on">Nutzungsstatistiken werden gelegentlich an Google Analytics gesendet, um den Entwickelnden die Verbesserung der App zu erleichtern</string> | ||
<string name="prefs_ga_collect_stats_summary_off">Gerade werden keine Statistiken zur Verbesserung der App an Google Analytics versandt</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="prefs_ga_collect_stats_title">Enviar estadísticas anónimas</string> | ||
<string name="prefs_ga_collect_stats_summary_on">Enviar estadísticas a Google Analytics ayuda a los desarrolladores a entender el uso de la aplicación y a mejorarla, pero puedes desinscribirte.</string> | ||
<string name="prefs_ga_collect_stats_summary_off">Enviar estadísticas a Google Analytics ayuda a los desarrolladores a entender el uso de la aplicación y a mejorarla, pero puedes desinscribirte.</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="prefs_ga_collect_stats_summary_on">Envoyer des données statistiques à Google Analytics aide les développeurs à comprendre l\'usage de l\'application et à l\'améliorer, mais vous pouvez désactiver cette option.</string> | ||
<string name="prefs_ga_collect_stats_summary_off">Envoyer des données statistiques à Google Analytics aide les développeurs à comprendre l\'usage de l\'application et à l\'améliorer, mais vous pouvez désactiver cette option.</string> | ||
<string name="prefs_ga_collect_stats_title">Envoyer des données anonymes</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<bool name="prefs_ga_collect_stats_default">true</bool> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="ga_tracking_id" translatable="false">UA-13228014-2</string> | ||
<string name="prefs_ga_collect_stats_key" translatable="false">ga_collect_stats</string> | ||
<string name="prefs_ga_collect_stats_title">Send anonymous statistics</string> | ||
<string name="prefs_ga_collect_stats_summary_on">Sending statistics to Google Analytics helps the developers to understand usage and improve the app, but you can opt out</string> | ||
<string name="prefs_ga_collect_stats_summary_off">Currently, your usage is not tracked in order to be sent to Google Analytics to help developers in their improvement endeavours</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.