Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Value Improved #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Value Improved #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
applicationId "website.julianrosser.birthdays"
minSdkVersion 14
targetSdkVersion 27
versionCode 301
versionCode 1
versionName "3.0.1"
}

Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/website/julianrosser/birthdays/activities/BirthdayListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/website/julianrosser/birthdays/activities/GoogleSignInActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/website/julianrosser/birthdays/activities/HelpActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/website/julianrosser/birthdays/activities/PrivacyPolicyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/website/julianrosser/birthdays/activities/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/website/julianrosser/birthdays/activities/WelcomeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/website/julianrosser/birthdays/recievers/NotificationBuilderReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

}
Expand Down