From 6d8bd8aee6770d4a4da152579049fe706dbde0e2 Mon Sep 17 00:00:00 2001
From: Juan Miguel Boyero Corral <juanmi1982@gmail.com>
Date: Sat, 19 Dec 2020 10:05:57 +0100
Subject: [PATCH] Disable indoor location module (#307)

---
 SWADroid/src/main/AndroidManifest.xml                     | 4 ++--
 SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java | 2 +-
 .../swad/swadroid/preferences/PreferencesActivity.java    | 4 ++--
 SWADroid/src/main/res/raw-es/authors.html                 | 4 ++--
 SWADroid/src/main/res/raw-es/changes.html                 | 8 ++++++--
 SWADroid/src/main/res/raw/authors.html                    | 4 ++--
 SWADroid/src/main/res/raw/changes.html                    | 8 ++++++--
 SWADroid/src/main/res/xml/preferences.xml                 | 7 ++++---
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/SWADroid/src/main/AndroidManifest.xml b/SWADroid/src/main/AndroidManifest.xml
index 7431a099c..76c0267fa 100644
--- a/SWADroid/src/main/AndroidManifest.xml
+++ b/SWADroid/src/main/AndroidManifest.xml
@@ -3,9 +3,10 @@
     package="es.ugr.swad.swadroid"
     android:installLocation="auto" >
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+<!--    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" android:maxSdkVersion="22"/>
@@ -17,7 +18,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <uses-feature
         android:name="android.hardware.touchscreen"
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
index 31f3bb280..7ca332457 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
@@ -582,7 +582,7 @@ private void createBaseMenu() {
         //Generate QR code
         mUsersData.add(getMenuItem(R.string.generateQRModuleLabel, R.string.fa_qrcode));
         //Manage location
-        mUsersData.add(getMenuItem(R.string.manageLocation, R.string.fa_map_marker));
+        //mUsersData.add(getMenuItem(R.string.manageLocation, R.string.fa_map_marker));
 
         //Messages category
         //Notifications
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
index 0138c511d..255c15a5e 100644
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
@@ -193,7 +193,7 @@ protected void onCreate(Bundle savedInstanceState) {
         privacyPolicyPref = findPreference(Preferences.PRIVACYPOLICYPREF);
         syncTimePref = findPreference(Preferences.SYNCTIMEPREF);
         syncEnablePref = (CheckBoxPreference) findPreference(Preferences.SYNCENABLEPREF);
-        syncTimeLocationPref = findPreference(Preferences.SYNCLOCATIONTIMEPREF);
+        //syncTimeLocationPref = findPreference(Preferences.SYNCLOCATIONTIMEPREF);
 
         ratePref.setOnPreferenceChangeListener(this);
         twitterPref.setOnPreferenceChangeListener(this);
@@ -205,7 +205,7 @@ protected void onCreate(Bundle savedInstanceState) {
         privacyPolicyPref.setOnPreferenceChangeListener(this);
         syncEnablePref.setOnPreferenceChangeListener(this);
         syncTimePref.setOnPreferenceChangeListener(this);
-        syncTimeLocationPref.setOnPreferenceChangeListener(this);
+        //syncTimeLocationPref.setOnPreferenceChangeListener(this);
 
         logOutPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             
diff --git a/SWADroid/src/main/res/raw-es/authors.html b/SWADroid/src/main/res/raw-es/authors.html
index 90e077fac..b296a84fb 100644
--- a/SWADroid/src/main/res/raw-es/authors.html
+++ b/SWADroid/src/main/res/raw-es/authors.html
@@ -57,11 +57,11 @@
                 <li>Mensajes: B&uacute;squeda de destinatarios</li>
             </ul>
         </li>
-        <li style="list-style-type: none;">
+        <!--<li style="list-style-type: none;">
             <a href="https://github.com/JaviBL8">Javier Bueno L&oacute;pez</a>
             <ul>
                 <li>M&oacute;dulo para localizaci&oacute;n en interiores</li>
             </ul>
-        </li>
+        </li>-->
     </ul>
 </body>
diff --git a/SWADroid/src/main/res/raw-es/changes.html b/SWADroid/src/main/res/raw-es/changes.html
index 34016e8d4..c66c64ee4 100644
--- a/SWADroid/src/main/res/raw-es/changes.html
+++ b/SWADroid/src/main/res/raw-es/changes.html
@@ -18,10 +18,14 @@
 </head>
 
 <body bgcolor="white">
-    <h4>1.6.0 (upcoming)</h4>
+    <!--<h4>1.6.0 (upcoming)</h4>
     <ul>
-        <li type="disc">Corregida descarga de archivos en Android R</li>
         <li type="disc">Añadido módulo para localización en interiores</li>
+    </ul>-->
+
+    <h4>1.5.7 (2020-12-19)</h4>
+    <ul>
+        <li type="disc">Corregida descarga de archivos en Android R</li>
     </ul>
 
     <h4>1.5.6 (2019-11-05)</h4>
diff --git a/SWADroid/src/main/res/raw/authors.html b/SWADroid/src/main/res/raw/authors.html
index 27febff32..ba513440a 100644
--- a/SWADroid/src/main/res/raw/authors.html
+++ b/SWADroid/src/main/res/raw/authors.html
@@ -57,11 +57,11 @@
                 <li>Messages: Search of recipients</li>
             </ul>
         </li>
-        <li style="list-style-type: none;">
+        <!--<li style="list-style-type: none;">
             <a href="https://github.com/JaviBL8">Javier Bueno L&oacute;pez</a>
             <ul>
                 <li>Module for indoor location</li>
             </ul>
-        </li>
+        </li>-->
     </ul>
 </body>
diff --git a/SWADroid/src/main/res/raw/changes.html b/SWADroid/src/main/res/raw/changes.html
index 3d596d490..aacb1b194 100644
--- a/SWADroid/src/main/res/raw/changes.html
+++ b/SWADroid/src/main/res/raw/changes.html
@@ -17,11 +17,15 @@
     </style>
 </head>
 
-<body bgcolor="white">
+<body bgcolor="white"><!--
     <h4>1.6.0 (upcoming)</h4>
     <ul>
-        <li type="disc">Fixed file downloads on Android R</li>
         <li type="disc">Added indoor location module</li>
+    </ul>-->
+
+    <h4>1.5.7 (2020-12-19)</h4>
+    <ul>
+        <li type="disc">Fixed file downloads on Android R</li>
     </ul>
 
     <h4>1.5.6 (2019-11-05)</h4>
diff --git a/SWADroid/src/main/res/xml/preferences.xml b/SWADroid/src/main/res/xml/preferences.xml
index d8f430b7e..58577eeee 100644
--- a/SWADroid/src/main/res/xml/preferences.xml
+++ b/SWADroid/src/main/res/xml/preferences.xml
@@ -26,7 +26,8 @@
             android:title="@string/prefSyncTimeTitle" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/prefSyncLocationTitle">
+    <!--<PreferenceCategory
+        android:title="@string/prefSyncLocationTitle"
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="@string/prefShareLocationKey"
@@ -39,8 +40,8 @@
             android:key="@string/prefSyncLocationTimeKey"
             android:summary="@string/prefSyncLocationTimeSummary"
             android:title="@string/prefSyncTimeTitle" />
-            />
-    </PreferenceCategory>
+        />
+    </PreferenceCategory>-->
     <PreferenceCategory android:title="@string/about_preferences" >
         <Preference
             android:defaultValue=""