From bf040dfe62ebed2f7e0d7db37612e3afe3b2dad4 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 19 Apr 2019 00:23:41 +0200
Subject: [PATCH] remove one-time location-streaming; it's not implemented and
 it's unclear ux-wise

---
 res/values/arrays.xml                                 |  1 -
 .../thoughtcrime/securesms/ShareLocationDialog.java   | 11 +++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 21df85153..d0955e1e3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -135,7 +135,6 @@
 
 
 <string-array name="share_location_durations">
-    <item>@string/share_location_once</item>
     <item>@string/share_location_for_5_minutes</item>
     <item>@string/share_location_for_30_minutes</item>
     <item>@string/share_location_for_one_hour</item>
diff --git a/src/org/thoughtcrime/securesms/ShareLocationDialog.java b/src/org/thoughtcrime/securesms/ShareLocationDialog.java
index 1acde1306..c353d7fab 100644
--- a/src/org/thoughtcrime/securesms/ShareLocationDialog.java
+++ b/src/org/thoughtcrime/securesms/ShareLocationDialog.java
@@ -33,12 +33,11 @@ public class ShareLocationDialog extends AlertDialog {
 
       switch (which) {
         default:
-        case 0:  shareLocationUnit = 1;  break;
-        case 1:  shareLocationUnit = 5 * 60; break;
-        case 2:  shareLocationUnit = 30 * 60; break;
-        case 3:  shareLocationUnit = 60 * 60;  break;
-        case 4:  shareLocationUnit = 60 * 60 * 2;   break;
-        case 5:  shareLocationUnit = 60 * 60 * 6;   break;
+        case 0:  shareLocationUnit =      5 * 60; break;
+        case 1:  shareLocationUnit =     30 * 60; break;
+        case 2:  shareLocationUnit =     60 * 60; break;
+        case 3:  shareLocationUnit = 2 * 60 * 60; break;
+        case 4:  shareLocationUnit = 6 * 60 * 60; break;
       }
 
       listener.onSelected(shareLocationUnit);