From 8ecb54e1f1b745a3a7ce2738f73dab21a54cc784 Mon Sep 17 00:00:00 2001
From: "kj7.sung" <kj7.sung@samsung.com>
Date: Mon, 7 Aug 2017 14:20:59 +0900
Subject: [PATCH] Remove invalid exception

Change-Id: Id39e09b5a1d9ab4ed32fcb914f4d3a95f4608b7c
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
---
 packaging/csapi-location.spec                     |  2 +-
 src/Tizen.Location/Tizen.Location/GpsSatellite.cs |  1 -
 src/Tizen.Location/Tizen.Location/Locator.cs      | 27 ++++++++---------------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/packaging/csapi-location.spec b/packaging/csapi-location.spec
index 9f05383..acd18a4 100755
--- a/packaging/csapi-location.spec
+++ b/packaging/csapi-location.spec
@@ -1,6 +1,6 @@
 Name:       csapi-location
 Summary:    Tizen Location API for C#
-Version:    1.0.8
+Version:    1.0.9
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0 and SAMSUNG
diff --git a/src/Tizen.Location/Tizen.Location/GpsSatellite.cs b/src/Tizen.Location/Tizen.Location/GpsSatellite.cs
index afd68ea..b9bf58d 100755
--- a/src/Tizen.Location/Tizen.Location/GpsSatellite.cs
+++ b/src/Tizen.Location/Tizen.Location/GpsSatellite.cs
@@ -40,7 +40,6 @@ namespace Tizen.Location
         /// </summary>
         /// <since_tizen>3</since_tizen>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the location is not supported.</exception>
         public int Interval
         {
             get
diff --git a/src/Tizen.Location/Tizen.Location/Locator.cs b/src/Tizen.Location/Tizen.Location/Locator.cs
index 3c8a85d..3c2d320 100755
--- a/src/Tizen.Location/Tizen.Location/Locator.cs
+++ b/src/Tizen.Location/Tizen.Location/Locator.cs
@@ -100,7 +100,6 @@ namespace Tizen.Location
         /// </summary>
         /// <since_tizen>3</since_tizen>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the location is not supported.</exception>
         public int Interval
         {
             get
@@ -129,7 +128,6 @@ namespace Tizen.Location
         /// </summary>
         /// <since_tizen>3</since_tizen>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the location is not supported.</exception>
         public int StayInterval
         {
             get
@@ -158,7 +156,6 @@ namespace Tizen.Location
         /// </summary>
         /// <since_tizen>3</since_tizen>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the location is not supported.</exception>
         public int BatchInterval
         {
             get
@@ -182,12 +179,11 @@ namespace Tizen.Location
         }
 
         /// <summary>
-        /// The time interval between batch callback updates. The BatchPeriod should be greater than or equal to the BatchInterval. If BatchPeriod is zero or smaller than BatchInterval, then batch mode will not working.
+        /// The time interval between batch callback updates. The BatchPeriod should be greater than or equal to the BatchInterval. If BatchPeriod is zero or smaller than BatchInterval, then batch mode will not working. In addition, sometimes the period may not work as you intended, the maximum permissible value for batch_period is device specific.
         /// Should be in the range [0~60000] seconds.
         /// </summary>
         /// <since_tizen>3</since_tizen>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the location is not supported.</exception>
         public int BatchPeriod
         {
             get
@@ -216,7 +212,6 @@ namespace Tizen.Location
         /// </summary>
         /// <since_tizen>3</since_tizen>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the location is not supported.</exception>
         public double Distance
         {
             get
@@ -559,7 +554,6 @@ namespace Tizen.Location
         /// </summary>
         /// <since_tizen>3</since_tizen>
         /// <exception cref="ArgumentException">Thrown when an invalid argument is used.</exception>
-        /// <exception cref="NotSupportedException">Thrown when the location is not supported.</exception>
         public void Dispose()
         {
             Dispose(true);
@@ -857,18 +851,15 @@ namespace Tizen.Location
             add
             {
                 Log.Info(Globals.LogTag, "Adding LocationChanged EventHandler");
-                if (_locationChanged == null)
+                if (_batchPeriod > 0 && _batchPeriod > _batchInterval)
                 {
-                    if (_batchPeriod > 0 && _batchPeriod > _batchInterval)
-                    {
-                        Log.Info(Globals.LogTag, "Calling function SetLocationBatchCallback");
-                        SetLocationBatchCallback();
-                    }
-                    else
-                    {
-                        Log.Info(Globals.LogTag, "Calling function SetLocationChangedCallback");
-                        SetLocationChangedCallback();
-                    }
+                    Log.Info(Globals.LogTag, "Calling function SetLocationBatchCallback");
+                    SetLocationBatchCallback();
+                }
+                else
+                {
+                    Log.Info(Globals.LogTag, "Calling function SetLocationChangedCallback");
+                    SetLocationChangedCallback();
                 }
                 _locationChanged += value;
             }
-- 
2.7.4