From 47a846bc2c33a9c97161cb308d27e8fdefe4ce35 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Mon, 20 Feb 2017 15:17:05 +0000
Subject: [PATCH] Remove timezone from create calendar page.

---
 .../davdroid/ui/CreateCalendarActivity.java   | 29 -------------------
 .../res/layout/activity_create_calendar.xml   | 10 -------
 2 files changed, 39 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java
index 4f2f5967..03733665 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/CreateCalendarActivity.java
@@ -18,18 +18,12 @@ import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
-import android.widget.Spinner;
-
-import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.TimeZone;
 
 import org.apache.commons.lang3.StringUtils;
 
 import at.bitfire.davdroid.R;
 import at.bitfire.davdroid.model.CollectionInfo;
-import at.bitfire.ical4android.DateUtils;
 import yuku.ambilwarna.AmbilWarnaDialog;
 
 public class CreateCalendarActivity extends AppCompatActivity {
@@ -62,19 +56,6 @@ public class CreateCalendarActivity extends AppCompatActivity {
                 }).show();
             }
         });
-
-        Spinner spinner = (Spinner) findViewById(R.id.time_zone);
-        String[] timeZones = TimeZone.getAvailableIDs();
-        spinner.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, timeZones));
-
-        // select system time zone
-        String defaultTimeZone = TimeZone.getDefault().getID();
-        for (int i = 0; i < timeZones.length; i++) {
-            if (timeZones[i].equals(defaultTimeZone)) {
-                spinner.setSelection(i);
-                break;
-            }
-        }
     }
 
     @Override
@@ -98,8 +79,6 @@ public class CreateCalendarActivity extends AppCompatActivity {
         boolean ok = true;
         CollectionInfo info = new CollectionInfo();
 
-        Spinner spinner;
-
         EditText edit = (EditText) findViewById(R.id.display_name);
         info.displayName = edit.getText().toString();
         if (TextUtils.isEmpty(info.displayName)) {
@@ -113,14 +92,6 @@ public class CreateCalendarActivity extends AppCompatActivity {
         View view = findViewById(R.id.color);
         info.color = ((ColorDrawable) view.getBackground()).getColor();
 
-        spinner = (Spinner) findViewById(R.id.time_zone);
-        net.fortuna.ical4j.model.TimeZone tz = DateUtils.tzRegistry.getTimeZone((String) spinner.getSelectedItem());
-        if (tz != null) {
-            Calendar cal = new Calendar();
-            cal.getComponents().add(tz.getVTimeZone());
-            info.timeZone = cal.toString();
-        }
-
         if (ok) {
             info.type = CollectionInfo.Type.CALENDAR;
             info.supportsVEVENT = true;
diff --git a/app/src/main/res/layout/activity_create_calendar.xml b/app/src/main/res/layout/activity_create_calendar.xml
index 03ebc74b..42f7ce30 100644
--- a/app/src/main/res/layout/activity_create_calendar.xml
+++ b/app/src/main/res/layout/activity_create_calendar.xml
@@ -59,16 +59,6 @@
                 android:text="@string/create_collection_color"/>
 
         </LinearLayout>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/create_calendar_time_zone"/>
-        <Spinner
-            android:id="@+id/time_zone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file