diff --git a/app/build.gradle b/app/build.gradle index 62b9d1a..b344b81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { applicationId "website.julianrosser.birthdays" minSdkVersion 14 targetSdkVersion 27 - versionCode 301 + versionCode 1 versionName "3.0.1" } @@ -20,7 +20,7 @@ android { lintOptions { disable "MissingTranslation" } } buildTypes.each { - it.buildConfigField 'String', 'GOOGLE_SIGN_IN_KEY', GOOGLE_SIGN_IN_KEY +// it.buildConfigField 'String', 'GOOGLE_SIGN_IN_KEY', GOOGLE_SIGN_IN_KEY } } packagingOptions { diff --git a/app/src/main/java/website/julianrosser/birthdays/activities/BirthdayListActivity.java b/app/src/main/java/website/julianrosser/birthdays/activities/BirthdayListActivity.java index a2f07d3..b266acc 100644 --- a/app/src/main/java/website/julianrosser/birthdays/activities/BirthdayListActivity.java +++ b/app/src/main/java/website/julianrosser/birthdays/activities/BirthdayListActivity.java @@ -377,7 +377,7 @@ synchronized public Tracker getDefaultTracker() { if (mTracker == null) { GoogleAnalytics analytics = GoogleAnalytics.getInstance(this); // To enable debug logging use: adb shell setprop log.tag.GAv4 DEBUG - mTracker = analytics.newTracker(R.xml.global_tracker); + // mTracker = analytics.newTracker(R.xml.global_tracker); } return mTracker; } diff --git a/app/src/main/java/website/julianrosser/birthdays/activities/GoogleSignInActivity.kt b/app/src/main/java/website/julianrosser/birthdays/activities/GoogleSignInActivity.kt index 4184879..de7d4dc 100644 --- a/app/src/main/java/website/julianrosser/birthdays/activities/GoogleSignInActivity.kt +++ b/app/src/main/java/website/julianrosser/birthdays/activities/GoogleSignInActivity.kt @@ -76,7 +76,7 @@ abstract class GoogleSignInActivity : BaseActivity(), GoogleApiClient.OnConnecti // Configure sign-in to request the user's ID, email address, and basic // profile. ID and basic profile are included in DEFAULT_SIGN_IN. val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) - .requestIdToken(BuildConfig.GOOGLE_SIGN_IN_KEY) + // .requestIdToken(BuildConfig.GOOGLE_SIGN_IN_KEY) .requestEmail() .build() diff --git a/app/src/main/java/website/julianrosser/birthdays/activities/HelpActivity.java b/app/src/main/java/website/julianrosser/birthdays/activities/HelpActivity.java index 34b93d8..db89b13 100644 --- a/app/src/main/java/website/julianrosser/birthdays/activities/HelpActivity.java +++ b/app/src/main/java/website/julianrosser/birthdays/activities/HelpActivity.java @@ -65,7 +65,7 @@ public void onClick(View v) { synchronized public Tracker getDefaultTracker() { if (mTracker == null) { GoogleAnalytics analytics = GoogleAnalytics.getInstance(this); - mTracker = analytics.newTracker(R.xml.global_tracker); + // mTracker = analytics.newTracker(R.xml.global_tracker); } return mTracker; } diff --git a/app/src/main/java/website/julianrosser/birthdays/activities/PrivacyPolicyActivity.java b/app/src/main/java/website/julianrosser/birthdays/activities/PrivacyPolicyActivity.java index 7cc0898..67ace11 100644 --- a/app/src/main/java/website/julianrosser/birthdays/activities/PrivacyPolicyActivity.java +++ b/app/src/main/java/website/julianrosser/birthdays/activities/PrivacyPolicyActivity.java @@ -55,7 +55,7 @@ private void setPrivacyTitleColour(TextView textPrivacySummary) { synchronized public Tracker getDefaultTracker() { if (mTracker == null) { GoogleAnalytics analytics = GoogleAnalytics.getInstance(this); - mTracker = analytics.newTracker(R.xml.global_tracker); + // mTracker = analytics.newTracker(R.xml.global_tracker); } return mTracker; } diff --git a/app/src/main/java/website/julianrosser/birthdays/activities/SettingsActivity.java b/app/src/main/java/website/julianrosser/birthdays/activities/SettingsActivity.java index 967d1fe..f69e8b4 100644 --- a/app/src/main/java/website/julianrosser/birthdays/activities/SettingsActivity.java +++ b/app/src/main/java/website/julianrosser/birthdays/activities/SettingsActivity.java @@ -80,7 +80,7 @@ synchronized public Tracker getDefaultTracker() { if (mTracker == null) { GoogleAnalytics analytics = GoogleAnalytics.getInstance(this); // To enable debug logging use: adb shell set prop log.tag.GAv4 DEBUG - mTracker = analytics.newTracker(R.xml.global_tracker); + // mTracker = analytics.newTracker(R.xml.global_tracker); } return mTracker; } diff --git a/app/src/main/java/website/julianrosser/birthdays/activities/WelcomeActivity.kt b/app/src/main/java/website/julianrosser/birthdays/activities/WelcomeActivity.kt index e2ece9c..76ddc3d 100644 --- a/app/src/main/java/website/julianrosser/birthdays/activities/WelcomeActivity.kt +++ b/app/src/main/java/website/julianrosser/birthdays/activities/WelcomeActivity.kt @@ -122,7 +122,7 @@ class WelcomeActivity : GoogleSignInActivity() { fun getDefaultTracker(): Tracker? { if (mTracker == null) { val analytics = GoogleAnalytics.getInstance(this) - mTracker = analytics.newTracker(R.xml.global_tracker) + // mTracker = analytics.newTracker(R.xml.global_tracker) } return mTracker } diff --git a/app/src/main/java/website/julianrosser/birthdays/recievers/NotificationBuilderReceiver.java b/app/src/main/java/website/julianrosser/birthdays/recievers/NotificationBuilderReceiver.java index 1304860..54a5a00 100644 --- a/app/src/main/java/website/julianrosser/birthdays/recievers/NotificationBuilderReceiver.java +++ b/app/src/main/java/website/julianrosser/birthdays/recievers/NotificationBuilderReceiver.java @@ -96,13 +96,13 @@ public void onReceive(Context context, Intent intent) { // Obtain the shared Tracker instance. GoogleAnalytics analytics = GoogleAnalytics.getInstance(context); - Tracker mTracker = analytics.newTracker(R.xml.global_tracker); + // Tracker mTracker = analytics.newTracker(R.xml.global_tracker); - mTracker.send(new HitBuilders.EventBuilder() + /* mTracker.send(new HitBuilders.EventBuilder() .setCategory("Action") .setAction("Reminder!") .build()); - +*/ wakeLock.release(); }