From ccab2ab05088b8617808d2d461ecebb51912c311 Mon Sep 17 00:00:00 2001 From: Christopher Neugebauer Date: Fri, 29 Jan 2016 07:44:28 +1100 Subject: [PATCH] Fixes timezone calendar bug --- android/app/src/main/java/org/s31/oscon2012/Config.java | 2 +- .../src/main/java/org/s31/oscon2012/TalkListingFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/java/org/s31/oscon2012/Config.java b/android/app/src/main/java/org/s31/oscon2012/Config.java index 38be404..2c02776 100644 --- a/android/app/src/main/java/org/s31/oscon2012/Config.java +++ b/android/app/src/main/java/org/s31/oscon2012/Config.java @@ -7,6 +7,6 @@ public class Config { - public static TimeZone confTimeZone = TimeZone.getTimeZone("America/Los_Angeles"); // The timezone for the conference + public static TimeZone confTimeZone = TimeZone.getTimeZone("Australia/Melbourne"); // The timezone for the conference } diff --git a/android/app/src/main/java/org/s31/oscon2012/TalkListingFragment.java b/android/app/src/main/java/org/s31/oscon2012/TalkListingFragment.java index 32a0c38..fb111e1 100644 --- a/android/app/src/main/java/org/s31/oscon2012/TalkListingFragment.java +++ b/android/app/src/main/java/org/s31/oscon2012/TalkListingFragment.java @@ -111,7 +111,7 @@ public void setShareIntent() { Intent i = new Intent(Intent.ACTION_SEND); i.setType("text/*"); i.putExtra(Intent.EXTRA_TITLE, mTitle); - i.putExtra(Intent.EXTRA_TEXT, String.format("%s - %s #lessbad #lca2016", mTitle, mUrl)); + i.putExtra(Intent.EXTRA_TEXT, String.format("%s - %s #lca2016", mTitle, mUrl)); if (mShareActionProvider != null) { mShareActionProvider.setShareIntent(i); }