Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

Disable indoor location module #307

Merged
merged 1 commit into from
Dec 19, 2020
Merged

Disable indoor location module #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SWADroid/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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() {

Expand Down
4 changes: 2 additions & 2 deletions SWADroid/src/main/res/raw-es/authors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 6 additions & 2 deletions SWADroid/src/main/res/raw-es/changes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions SWADroid/src/main/res/raw/authors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 6 additions & 2 deletions SWADroid/src/main/res/raw/changes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions SWADroid/src/main/res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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=""
Expand Down