Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 28 Wiki Activity

Merge branch 'release/1.5.7'

Browse Source
This commit is contained in:
Amab 2020-12-19 10:12:57 +01:00
commit 29e2738660
10 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -31,17 +31,16 @@ script:
after_failure: cat $TRAVIS_BUILD_DIR/SWADroid/build/reports/lint-results.xml
before_deploy:
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./.travis/run_on_before_deploy.sh; fi'
- cd $TRAVIS_BUILD_DIR/SWADroid/build/outputs/apk/prod
- jarsigner -sigalg SHA1withRSA -digestalg SHA1 -keystore ${TRAVIS_BUILD_DIR}/keystore.jks
-storepass $storepass -keypass $keypass SWADroid-prod-unsigned.apk amab
- jarsigner -verify SWADroid-prod-unsigned.apk
- "${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS}/zipalign -p 4 SWADroid-prod-unsigned.apk
SWADroid-release.apk"
- "cd $TRAVIS_BUILD_DIR/SWADroid/build/outputs/apk/prod"
- "${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS}/zipalign -p 4 SWADroid-prod-unsigned.apk SWADroid-prod-zipaligned.apk"
- "apksigner sign --ks ${TRAVIS_BUILD_DIR}/keystore.jks --ks-pass pass:$storepass --key-pass pass:$keypass --out SWADroid-release.apk SWADroid-prod-zipaligned.apk"
- "apksigner verify SWADroid-release.apk"
deploy:
provider: releases
token:
secure: "IzDdPlY0KyCF1TUdUUeYYU/vBCNmJpxZ/w3B7QeVd1BhyL947jiyJpdEckJhMB7z4MWt5IHRGOXU2pYGxoJC86ES/33Acn91eo22FuaeRmIwjxL9yczae5KmakrSUA8iDjubfjLeWRy/MXAIGJ9qAuLOreAe/xGEoAILCxlJMjANw0AuJG+dBabBc2pt67bjaJO4WNFCkfDK9AC8XGJPXlwWB4L1IDwPQLBWEVRyhf3Ac1Om0lzf7kF240xCcR/cmLqOXArU8iRr3n30HaRQOBibCMjnds7etA+Fs1HiyB8B5gqMXpUM02hI35R9GHOrgqO/+N5lNMdDveLjLhwjPXrkIoWrzI/QifXxnnpa/bCqo4knjy7B8CGAZ5Z3w9Hq/zN2YAkLUIMyl9z1b2LzN9pzAh5SrtuRCBJKUfB7I/qv+wEVj8vrFrZDnMuQntAfBtKu6bD0L/lupkKD31L1i3G9bG3vSaaGauQGqi2/ORyPtLVhgH7LQI7gMzghi2DP1BhgrJCUHK4O7dky0klr0spfEiOLKhZQhzVosjXySh2CLzo/pqkCzWCjr6ozvzyc2VTxh5EvheJvw1gxl5eGlTDzCIu4U9ebQ5X5jXm7uec2c9tn9IYxBjASC7ay9x6UuM7khdbqg4RQ0JLo/6032ZIkxuloZMGF8P1jzHHCtko="
file: "$TRAVIS_BUILD_DIR/SWADroid/build/outputs/apk/prod/SWADroid-release.apk"
cleanup: false
skip_cleanup: true
name: SWADroid $TRAVIS_TAG
release_notes: Automated release from Travis CI.

2
SWADroid/build.gradle
View File

@ -93,6 +93,6 @@ dependencies {
implementation 'com.google.zxing:core:3.4.1'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.android.material:material:1.2.1'
implementation platform('com.google.firebase:firebase-bom:26.1.1')
implementation platform('com.google.firebase:firebase-bom:26.2.0')
implementation 'com.google.firebase:firebase-analytics'
}

4
SWADroid/src/main/AndroidManifest.xml
View File

@ -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"

2
SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java
View File

@ -582,7 +582,7 @@ public class SWADMain extends MenuExpandableListActivity {
//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

4
SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java
View File

@ -193,7 +193,7 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere
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 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere
privacyPolicyPref.setOnPreferenceChangeListener(this);
syncEnablePref.setOnPreferenceChangeListener(this);
syncTimePref.setOnPreferenceChangeListener(this);
syncTimeLocationPref.setOnPreferenceChangeListener(this);
//syncTimeLocationPref.setOnPreferenceChangeListener(this);
logOutPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {

4
SWADroid/src/main/res/raw-es/authors.html
View File

@ -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
SWADroid/src/main/res/raw-es/changes.html
View File

@ -18,10 +18,14 @@
</head>
<body bgcolor="white">
<h4>1.6.0 (upcoming)</h4>
<!--<h4>1.6.0 (upcoming)</h4>
<ul>
<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>
<li type="disc">Añadido módulo para localización en interiores</li>
</ul>
<h4>1.5.6 (2019-11-05)</h4>

4
SWADroid/src/main/res/raw/authors.html
View File

@ -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
SWADroid/src/main/res/raw/changes.html
View File

@ -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>

7
SWADroid/src/main/res/xml/preferences.xml
View File

@ -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=""