From 7e2c8fdae4847515846bb2fba1d36976b92ee439 Mon Sep 17 00:00:00 2001
From: Matthieu PASCAUD <matthieu.pascaud@c-s.fr>
Date: Wed, 8 Mar 2017 14:14:23 +0100
Subject: [PATCH] Remove any call to Google Analytics Disable Google Analytics
library in build.gradle
---
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 +-
stavor/build.gradle | 5 +-
.../main/java/cs/si/stavor/AboutActivity.java | 15 +---
.../main/java/cs/si/stavor/MainActivity.java | 17 +---
.../java/cs/si/stavor/MissionActivity.java | 32 +-------
.../java/cs/si/stavor/StationActivity.java | 30 +------
.../java/cs/si/stavor/StavorApplication.java | 32 --------
.../java/cs/si/stavor/app/Parameters.java | 1 -
.../java/cs/si/stavor/app/RatingSystem.java | 50 +-----------
.../cs/si/stavor/fragments/HudFragment.java | 25 +-----
.../cs/si/stavor/fragments/MapFragment.java | 13 +--
.../cs/si/stavor/fragments/OrbitFragment.java | 13 +--
.../stavor/fragments/SimulatorFragment.java | 26 +-----
.../si/stavor/fragments/StationsFragment.java | 12 +--
.../settings/SettingsBasicFragment.java | 13 +--
.../settings/SettingsCoverageFragment.java | 10 ---
.../settings/SettingsExtraFragment.java | 10 ---
.../settings/SettingsGeneralFragment.java | 10 ---
.../settings/SettingsGeneralMapFragment.java | 11 ---
.../settings/SettingsMeasuresFragment.java | 12 ---
.../settings/SettingsModelsFragment.java | 13 ---
.../settings/SettingsOrbitFragment.java | 11 ---
.../cs/si/stavor/simulator/Simulator.java | 80 +------------------
24 files changed, 22 insertions(+), 425 deletions(-)
diff --git a/build.gradle b/build.gradle
index e26cdeef..e7e3c60b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:2.2.2'
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760..d195edd8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Mon Nov 21 11:20:57 CET 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/stavor/build.gradle b/stavor/build.gradle
index d5fe59ab..8d94cde9 100644
--- a/stavor/build.gradle
+++ b/stavor/build.gradle
@@ -13,8 +13,8 @@ android {
config {
keyAlias 'Stavor'
keyPassword '2TqXSDgA'
- storeFile file('D:/Users/xgibert/CS/Projets/Stavor_files/Release/Keys_CS_Mobile/releaseKey')
- storePassword '2TqXSDgA'
+ //storeFile file('D:/Users/xgibert/CS/Projets/Stavor_files/Release/Keys_CS_Mobile/releaseKey')
+ //storePassword '2TqXSDgA'
}
}
compileSdkVersion 21
@@ -72,7 +72,6 @@ dependencies {
//compile project(':crosswalkwebview103923515arm')
//compile 'org.xwalk:xwalk_core_library:10.39.235.15'
compile 'org.xwalk:xwalk_core_library:13.42.319.11'
- compile 'com.google.android.gms:play-services:+'
compile 'com.android.support:multidex:1.0.+'
compile 'com.android.support:appcompat-v7:21.0.3'
compile files('libs/gson-2.2.4.jar')
diff --git a/stavor/src/main/java/cs/si/stavor/AboutActivity.java b/stavor/src/main/java/cs/si/stavor/AboutActivity.java
index 2913499b..3bd59641 100644
--- a/stavor/src/main/java/cs/si/stavor/AboutActivity.java
+++ b/stavor/src/main/java/cs/si/stavor/AboutActivity.java
@@ -14,8 +14,6 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
/**
* Activity to show the app About screen
@@ -89,18 +87,7 @@ public class AboutActivity extends Activity {
ImageView img_jocs = (ImageView) findViewById(R.id.imageView2);
img_jocs.setOnClickListener(new View.OnClickListener(){
public void onClick(View v){
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getApplication()).getTracker(
- StavorApplication.TrackerName.APP_TRACKER);
- t.setScreenName("About");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Link")
- .setAction("JOCS")
- .setLabel("JOCS")
- .setValue(1)
- .build());
- //***************************************
+
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
diff --git a/stavor/src/main/java/cs/si/stavor/MainActivity.java b/stavor/src/main/java/cs/si/stavor/MainActivity.java
index 12992689..110910ed 100644
--- a/stavor/src/main/java/cs/si/stavor/MainActivity.java
+++ b/stavor/src/main/java/cs/si/stavor/MainActivity.java
@@ -16,12 +16,8 @@ import java.util.ArrayList;
//import org.xwalk.core.XWalkSettings;
import org.xwalk.core.XWalkView;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
import unused.WelcomeDialogFragment;
import cs.si.stavor.R;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.app.Installer;
import cs.si.stavor.app.OrekitInit;
import cs.si.stavor.app.Parameters;
@@ -507,18 +503,7 @@ public class MainActivity extends ActionBarActivity implements
private ShareActionProvider mShareActionProvider;
private void launchMarket() {
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("Menu");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Menu")
- .setAction("Rate")
- .setLabel("Rate")
- .setValue(1)
- .build());
- //***************************************
+
Uri uri = Uri.parse("market://details?id=" + getPackageName());
Intent myAppLinkToMarket = new Intent(Intent.ACTION_VIEW, uri);
diff --git a/stavor/src/main/java/cs/si/stavor/MissionActivity.java b/stavor/src/main/java/cs/si/stavor/MissionActivity.java
index a669a2d7..97426389 100644
--- a/stavor/src/main/java/cs/si/stavor/MissionActivity.java
+++ b/stavor/src/main/java/cs/si/stavor/MissionActivity.java
@@ -8,11 +8,6 @@ import org.orekit.time.DateTimeComponents;
import org.orekit.time.TimeScale;
import org.orekit.time.TimeScalesFactory;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
-import cs.si.stavor.R;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.app.Parameters;
import cs.si.stavor.database.SerializationUtil;
import cs.si.stavor.database.MissionReaderContract.MissionEntry;
@@ -130,20 +125,7 @@ public class MissionActivity extends Activity{
if(isEdit){
//Update register with new name and serialized
if(editMission()){
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("MissionEditor");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("MissionEditor")
- .setAction("Edit")
- .setLabel(mission.mission.name)
- .setValue(1)
- .build());
- //***************************************
-
- //((StavorApplication)getApplication()).loader.reset();
+
finish();
}else{
Toast.makeText(getApplicationContext(), getString(R.string.mission_error_edit), Toast.LENGTH_LONG).show();
@@ -151,18 +133,6 @@ public class MissionActivity extends Activity{
}else{
//Create new register in db
if(addMission()){
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("MissionEditor");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("MissionEditor")
- .setAction("Create")
- .setLabel(mission.mission.name)
- .setValue(1)
- .build());
- //***************************************
//((StavorApplication)getApplication()).loader.reset();
finish();
diff --git a/stavor/src/main/java/cs/si/stavor/StationActivity.java b/stavor/src/main/java/cs/si/stavor/StationActivity.java
index 7f868852..a8ee2099 100644
--- a/stavor/src/main/java/cs/si/stavor/StationActivity.java
+++ b/stavor/src/main/java/cs/si/stavor/StationActivity.java
@@ -1,11 +1,7 @@
package cs.si.stavor;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-import cs.si.stavor.R;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.database.StationsReaderContract.StationEntry;
import cs.si.stavor.station.GroundStation;
import cs.si.stavor.station.StationAndId;
@@ -68,18 +64,7 @@ public class StationActivity extends Activity{
if(isEdit){
//Update register with new name and serialized
if(editStation()){
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("StationEditor");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("StationEditor")
- .setAction("Edit")
- .setLabel(station.station.name)
- .setValue(1)
- .build());
- //***************************************
+
//((StavorApplication)getApplication()).loader.reset();
finish();
@@ -89,18 +74,7 @@ public class StationActivity extends Activity{
}else{
//Create new register in db
if(addStation()){
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("StationEditor");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("StationEditor")
- .setAction("Create")
- .setLabel(station.station.name)
- .setValue(1)
- .build());
- //***************************************
+
//((StavorApplication)getApplication()).loader.reset();
finish();
diff --git a/stavor/src/main/java/cs/si/stavor/StavorApplication.java b/stavor/src/main/java/cs/si/stavor/StavorApplication.java
index fb603f2b..42de7dbb 100644
--- a/stavor/src/main/java/cs/si/stavor/StavorApplication.java
+++ b/stavor/src/main/java/cs/si/stavor/StavorApplication.java
@@ -3,9 +3,6 @@ package cs.si.stavor;
import java.util.HashMap;
import com.commonsware.cwac.loaderex.SQLiteCursorLoader;
-import com.google.android.gms.analytics.GoogleAnalytics;
-import com.google.android.gms.analytics.Tracker;
-
import cs.si.stavor.app.Parameters;
import cs.si.stavor.database.ReaderDbHelper;
import cs.si.stavor.web.WebAppInterface;
@@ -49,34 +46,5 @@ public class StavorApplication extends MultiDexApplication {
public String getSearchTerm() {
return this.searchTerm;
}
-
- //********************** GOOGLE ANALYTICS
- /**
- * Enum used to identify the tracker that needs to be used for tracking.
- *
- * A single tracker is usually enough for most purposes. In case you do need multiple trackers,
- * storing them all in Application object helps ensure that they are created only once per
- * application instance.
- */
- public enum TrackerName {
- APP_TRACKER, // Tracker used only in this app.
- //GLOBAL_TRACKER, // Tracker used by all the apps from a company. eg: roll-up tracking.
- //ECOMMERCE_TRACKER, // Tracker used by all ecommerce transactions from a company.
- }
- HashMap<TrackerName, Tracker> mTrackers = new HashMap<TrackerName, Tracker>();
-
- public synchronized Tracker getTracker(TrackerName trackerId) {
- GoogleAnalytics.getInstance(this).setAppOptOut(BuildConfig.DEBUG);
- if (!mTrackers.containsKey(trackerId)) {
-
- GoogleAnalytics analytics = GoogleAnalytics.getInstance(this);
- /*Tracker t = (trackerId == TrackerName.APP_TRACKER) ? analytics.newTracker(PROPERTY_ID)
- : (trackerId == TrackerName.GLOBAL_TRACKER) ? analytics.newTracker(R.xml.global_tracker)
- : analytics.newTracker(R.xml.ecommerce_tracker);*/
- Tracker t = analytics.newTracker(R.xml.tracker);
- mTrackers.put(trackerId, t);
- }
- return mTrackers.get(trackerId);
- }
}
\ No newline at end of file
diff --git a/stavor/src/main/java/cs/si/stavor/app/Parameters.java b/stavor/src/main/java/cs/si/stavor/app/Parameters.java
index 32e02909..0dc79bfa 100644
--- a/stavor/src/main/java/cs/si/stavor/app/Parameters.java
+++ b/stavor/src/main/java/cs/si/stavor/app/Parameters.java
@@ -12,7 +12,6 @@ public class Parameters {
*
*/
public static class App {
- //public static final String google_analytics_property_id = "UA-58638794-1";
public static final int splash_min_time_ms = 3000;//[ms] 3.0s min
public static final boolean show_tests_section = false;
diff --git a/stavor/src/main/java/cs/si/stavor/app/RatingSystem.java b/stavor/src/main/java/cs/si/stavor/app/RatingSystem.java
index d0a4951a..f7b2b440 100644
--- a/stavor/src/main/java/cs/si/stavor/app/RatingSystem.java
+++ b/stavor/src/main/java/cs/si/stavor/app/RatingSystem.java
@@ -1,12 +1,9 @@
package cs.si.stavor.app;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.MainActivity;
import cs.si.stavor.R;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.app.Dialog;
import android.app.ActionBar.LayoutParams;
@@ -46,13 +43,7 @@ public class RatingSystem {
}
private static void showSuggestion(final Activity activity, final SharedPreferences.Editor editor){
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
+
final Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@@ -87,19 +78,7 @@ public class RatingSystem {
}
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + activity.getPackageName())));
dialog.dismiss();
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- //t.setScreenName(screenName);
- t.send(new HitBuilders.EventBuilder()
- .setCategory(screenName)
- .setAction("Rate")
- .setLabel("Rate")
- .setValue(1)
- .build());
- //***************************************
+
}
});
ll.addView(b1);
@@ -114,18 +93,6 @@ public class RatingSystem {
}
dialog.dismiss();
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- //t.setScreenName(screenName);
- t.send(new HitBuilders.EventBuilder()
- .setCategory(screenName)
- .setAction("Remind")
- .setLabel("Remind")
- .setValue(1)
- .build());
- //***************************************
}
});
ll.addView(b2);
@@ -140,18 +107,7 @@ public class RatingSystem {
}
dialog.dismiss();
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- //t.setScreenName(screenName);
- t.send(new HitBuilders.EventBuilder()
- .setCategory(screenName)
- .setAction("No")
- .setLabel("No")
- .setValue(1)
- .build());
- //***************************************
+
}
});
ll.addView(b3);
diff --git a/stavor/src/main/java/cs/si/stavor/fragments/HudFragment.java b/stavor/src/main/java/cs/si/stavor/fragments/HudFragment.java
index 859e871a..5eea4e38 100644
--- a/stavor/src/main/java/cs/si/stavor/fragments/HudFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/fragments/HudFragment.java
@@ -3,13 +3,10 @@ package cs.si.stavor.fragments;
import org.xwalk.core.XWalkView;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.app.Parameters;
import cs.si.stavor.model.Browsers;
import cs.si.stavor.simulator.Simulator;
@@ -85,13 +82,6 @@ public final class HudFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
View rootView = inflater.inflate(R.layout.hud_display, container,
false);
@@ -309,20 +299,7 @@ public final class HudFragment extends Fragment {
}
views_menu.setText(com_view);
mXwalkView.load("javascript:changeView('"+command+"')", null);
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.EventBuilder()
- .setCategory(screenName)
- .setAction("ChangeView")
- .setLabel(command)
- .setValue(1)
- .build());
- //***************************************
-
+
return true;
}
});
diff --git a/stavor/src/main/java/cs/si/stavor/fragments/MapFragment.java b/stavor/src/main/java/cs/si/stavor/fragments/MapFragment.java
index 0ad4bb7f..650a7046 100644
--- a/stavor/src/main/java/cs/si/stavor/fragments/MapFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/fragments/MapFragment.java
@@ -3,13 +3,9 @@ package cs.si.stavor.fragments;
import org.xwalk.core.XWalkView;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
import cs.si.stavor.MainActivity;
import cs.si.stavor.R;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.app.Parameters;
import cs.si.stavor.model.Browsers;
import cs.si.stavor.simulator.Simulator;
@@ -81,14 +77,7 @@ public final class MapFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
+
View rootView = inflater.inflate(R.layout.map_display, container,
false);
diff --git a/stavor/src/main/java/cs/si/stavor/fragments/OrbitFragment.java b/stavor/src/main/java/cs/si/stavor/fragments/OrbitFragment.java
index 87cc7712..cfe10454 100644
--- a/stavor/src/main/java/cs/si/stavor/fragments/OrbitFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/fragments/OrbitFragment.java
@@ -3,13 +3,9 @@ package cs.si.stavor.fragments;
import org.xwalk.core.XWalkView;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.model.Browsers;
import cs.si.stavor.simulator.Simulator;
import android.annotation.SuppressLint;
@@ -76,14 +72,7 @@ public final class OrbitFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
+
View rootView = inflater.inflate(R.layout.orb_display, container,
false);
diff --git a/stavor/src/main/java/cs/si/stavor/fragments/SimulatorFragment.java b/stavor/src/main/java/cs/si/stavor/fragments/SimulatorFragment.java
index 39b81be0..5fc24821 100644
--- a/stavor/src/main/java/cs/si/stavor/fragments/SimulatorFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/fragments/SimulatorFragment.java
@@ -3,7 +3,6 @@ package cs.si.stavor.fragments;
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.app.Parameters;
import cs.si.stavor.database.MissionReaderContract;
import cs.si.stavor.database.ReaderDbHelper;
@@ -58,8 +57,7 @@ import android.widget.TextView;
import android.widget.ViewSwitcher;
import com.commonsware.cwac.loaderex.SQLiteCursorLoader;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
+
/**
* Fragment to show all the simulator configurations
@@ -105,14 +103,7 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
+
View rootView = inflater.inflate(R.layout.sim, container,
false);
@@ -295,18 +286,7 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks
ImageView img_orekit = (ImageView)rootView.findViewById(R.id.nav_item_icon);
img_orekit.setOnClickListener(new View.OnClickListener(){
public void onClick(View v){
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- StavorApplication.TrackerName.APP_TRACKER);
- t.setScreenName("Simulator");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Link")
- .setAction("Orekit")
- .setLabel("Orekit")
- .setValue(1)
- .build());
- //***************************************
+
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
diff --git a/stavor/src/main/java/cs/si/stavor/fragments/StationsFragment.java b/stavor/src/main/java/cs/si/stavor/fragments/StationsFragment.java
index 83a96b10..b39ab03a 100644
--- a/stavor/src/main/java/cs/si/stavor/fragments/StationsFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/fragments/StationsFragment.java
@@ -3,7 +3,6 @@ package cs.si.stavor.fragments;
import cs.si.stavor.MainActivity;
import cs.si.stavor.R;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.database.MissionReaderContract;
import cs.si.stavor.database.ReaderDbHelper;
import cs.si.stavor.database.StationsCursorAdapter;
@@ -33,8 +32,6 @@ import android.widget.Toast;
import android.widget.TextView;
import com.commonsware.cwac.loaderex.SQLiteCursorLoader;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
/**
* Fragment to show all the simulator configurations
@@ -72,14 +69,7 @@ public final class StationsFragment extends Fragment implements LoaderCallbacks<
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
+
View rootView = inflater.inflate(R.layout.stations, container,
false);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsBasicFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsBasicFragment.java
index b1d7bb30..43b71e5f 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsBasicFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsBasicFragment.java
@@ -1,12 +1,8 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -49,14 +45,7 @@ public class SettingsBasicFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
+
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.basic_indicators);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsCoverageFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsCoverageFragment.java
index dc5aa9b6..911afeaa 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsCoverageFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsCoverageFragment.java
@@ -1,12 +1,9 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.MainActivity;
import cs.si.stavor.R;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -50,13 +47,6 @@ public class SettingsCoverageFragment extends PreferenceFragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.coverage);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsExtraFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsExtraFragment.java
index d5343870..bc6d54fc 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsExtraFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsExtraFragment.java
@@ -1,12 +1,9 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -51,13 +48,6 @@ public class SettingsExtraFragment extends PreferenceFragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.extra_indicators);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralFragment.java
index 643655ae..1501646e 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralFragment.java
@@ -1,12 +1,9 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -51,13 +48,6 @@ public class SettingsGeneralFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.preferences);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralMapFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralMapFragment.java
index 3ad77591..b228e02a 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralMapFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsGeneralMapFragment.java
@@ -1,12 +1,9 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.MainActivity;
import cs.si.stavor.R;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -49,14 +46,6 @@ public class SettingsGeneralMapFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.preferences_map);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsMeasuresFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsMeasuresFragment.java
index 700a680d..5fc73a3d 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsMeasuresFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsMeasuresFragment.java
@@ -1,12 +1,8 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
-import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -50,14 +46,6 @@ public class SettingsMeasuresFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.measures);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsModelsFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsModelsFragment.java
index 7b3a86cf..03650640 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsModelsFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsModelsFragment.java
@@ -1,12 +1,7 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
-import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -50,14 +45,6 @@ public class SettingsModelsFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.models);
diff --git a/stavor/src/main/java/cs/si/stavor/settings/SettingsOrbitFragment.java b/stavor/src/main/java/cs/si/stavor/settings/SettingsOrbitFragment.java
index a0c2e68d..faf31046 100644
--- a/stavor/src/main/java/cs/si/stavor/settings/SettingsOrbitFragment.java
+++ b/stavor/src/main/java/cs/si/stavor/settings/SettingsOrbitFragment.java
@@ -1,12 +1,8 @@
package cs.si.stavor.settings;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
-import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import android.app.Activity;
import android.os.Bundle;
import android.preference.PreferenceFragment;
@@ -50,13 +46,6 @@ public class SettingsOrbitFragment extends PreferenceFragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- //********** Google Analytics ***********
- // Get tracker.
- Tracker t = ((StavorApplication) getActivity().getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName(screenName);
- t.send(new HitBuilders.AppViewBuilder().build());
- //***************************************
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.orbit);
diff --git a/stavor/src/main/java/cs/si/stavor/simulator/Simulator.java b/stavor/src/main/java/cs/si/stavor/simulator/Simulator.java
index e698214a..ede80de5 100644
--- a/stavor/src/main/java/cs/si/stavor/simulator/Simulator.java
+++ b/stavor/src/main/java/cs/si/stavor/simulator/Simulator.java
@@ -2,13 +2,9 @@ package cs.si.stavor.simulator;
import org.xwalk.core.XWalkView;
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
import cs.si.stavor.R;
import cs.si.stavor.MainActivity;
import cs.si.stavor.StavorApplication;
-import cs.si.stavor.StavorApplication.TrackerName;
import cs.si.stavor.app.Parameters;
import cs.si.stavor.mission.Mission;
import cs.si.stavor.model.Browsers;
@@ -236,22 +232,6 @@ public class Simulator {
simulationStatus = SimulationStatus.Pause;
playCondition = new ConditionVariable(false);
connectThread();
-
- //********** Google Analytics ***********
- boolean remote = sharedPref.getBoolean(context.getString(R.string.pref_key_sim_global_remote), false);
- String remote_str = "Local";
- if(remote) remote_str = "Remote";
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("Simulator");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Simulator")
- .setAction("Connect")
- .setLabel(remote_str)
- .setValue(1)
- .build());
- //***************************************
}
return simulatorStatus;
}
@@ -265,22 +245,7 @@ public class Simulator {
if(simulatorStatus.equals(SimulatorStatus.Connected)){
resetSelectedMissionId();
disconnectThread();
-
- //********** Google Analytics ***********
- boolean remote = sharedPref.getBoolean(context.getString(R.string.pref_key_sim_global_remote), false);
- String remote_str = "Local";
- if(remote) remote_str = "Remote";
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("Simulator");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Simulator")
- .setAction("Disconnect")
- .setLabel(remote_str)
- .setValue(1)
- .build());
- //***************************************
+
}
return simulatorStatus;
}
@@ -299,17 +264,6 @@ public class Simulator {
boolean remote = sharedPref.getBoolean(context.getString(R.string.pref_key_sim_global_remote), false);
String remote_str = "Local";
if(remote) remote_str = "Remote";
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("Simulator");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Simulator")
- .setAction("Play")
- .setLabel(remote_str)
- .setValue(1)
- .build());
- //***************************************
}
}
setCorrectSimulatorControls();
@@ -325,22 +279,6 @@ public class Simulator {
if(simulationStatus.equals(SimulationStatus.Play)){
pauseThread();
simulationStatus = SimulationStatus.Pause;
-
- //********** Google Analytics ***********
- boolean remote = sharedPref.getBoolean(context.getString(R.string.pref_key_sim_global_remote), false);
- String remote_str = "Local";
- if(remote) remote_str = "Remote";
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("Simulator");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Simulator")
- .setAction("Pause")
- .setLabel(remote_str)
- .setValue(1)
- .build());
- //***************************************
}
}
setCorrectSimulatorControls();
@@ -355,22 +293,6 @@ public class Simulator {
if(simulatorStatus.equals(SimulatorStatus.Connected)){
play();
reset=true;
-
- //********** Google Analytics ***********
- boolean remote = sharedPref.getBoolean(context.getString(R.string.pref_key_sim_global_remote), false);
- String remote_str = "Local";
- if(remote) remote_str = "Remote";
- // Get tracker.
- Tracker t = ((StavorApplication) activity.getApplication()).getTracker(
- TrackerName.APP_TRACKER);
- t.setScreenName("Simulator");
- t.send(new HitBuilders.EventBuilder()
- .setCategory("Simulator")
- .setAction("Stop")
- .setLabel(remote_str)
- .setValue(1)
- .build());
- //***************************************
}
return simulationStatus;
}
--
GitLab