kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 12:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into iadeelzafar/wifi-hotspot

Browse Source
This commit is contained in:
Adeel Zafar 2019-08-13 23:38:28 +05:00
commit d1bfa65790
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/build.gradle
View File

@ -152,9 +152,9 @@ if (custom.listFiles()) {
def fileName = file.getName() def fileName = file.getName()
if (fileName.startsWith(".") || if (fileName.startsWith(".") ||
fileName.contains("test") || fileName.contains("test") ||
fileName == "main" || fileName == "main" ||
fileName.contains("Test")) { fileName.contains("Test")) {
return return
} }
map.put(fileName, file.getAbsolutePath()) map.put(fileName, file.getAbsolutePath())
@ -170,8 +170,8 @@ tasks.withType(Test) {
} }
def branchName = System.getenv('TRAVIS_PULL_REQUEST') ?: "false" == "false" def branchName = System.getenv('TRAVIS_PULL_REQUEST') ?: "false" == "false"
? System.getenv('TRAVIS_BRANCH') ?: "local" ? System.getenv('TRAVIS_BRANCH') ?: "local"
: System.getenv('TRAVIS_PULL_REQUEST_BRANCH') : System.getenv('TRAVIS_PULL_REQUEST_BRANCH')
def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev" def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev"
ext { ext {
@ -198,9 +198,9 @@ private String generateVersionName() {
private Integer generateVersionCode() { private Integer generateVersionCode() {
20 * 10000 + 20 * 10000 +
(ext.versionMajor * 10000) + (ext.versionMajor * 10000) +
(ext.versionMinor * 100) + (ext.versionMinor * 100) +
(ext.versionPatch) (ext.versionPatch)
} }
android { android {
@ -228,12 +228,15 @@ android {
abortOnError true abortOnError true
checkAllWarnings true checkAllWarnings true
warningsAsErrors true warningsAsErrors true
//TODO stop ignoring
ignore 'MissingTranslation', ignore 'SyntheticAccessor',
'CheckResult', //TODO stop ignoring below this
'LabelFor', 'MissingTranslation',
'DuplicateStrings', 'CheckResult',
'LogConditional' 'LabelFor',
'DuplicateStrings',
'LogConditional'
warning 'UnknownNullness', warning 'UnknownNullness',
'SelectableText', 'SelectableText',
'IconDensities' 'IconDensities'
@ -437,9 +440,9 @@ android {
def baseAbiVersionCode = abiCodes.get(output.getFilter(OutputFile.ABI)) ?: 0 def baseAbiVersionCode = abiCodes.get(output.getFilter(OutputFile.ABI)) ?: 0
def baseDensityVersionCode = densityCodes.get(output.getFilter(OutputFile.DENSITY)) ?: 1 def baseDensityVersionCode = densityCodes.get(output.getFilter(OutputFile.DENSITY)) ?: 1
output.versionCodeOverride = output.versionCodeOverride =
(baseDensityVersionCode * 10000000) + (baseDensityVersionCode * 10000000) +
(baseAbiVersionCode * 1000000) + (baseAbiVersionCode * 1000000) +
variant.versionCode variant.versionCode
} }
} }
} }
@ -474,7 +477,7 @@ class TestDroidUpload extends TestServer {
System.out.println(id) System.out.println(id)
try { try {
delegate.postResource(createUri(selfURI, "/files/" + id + "/share"), delegate.postResource(createUri(selfURI, "/files/" + id + "/share"),
[accessGroupId: accessGroup], APIProject.class) [accessGroupId: accessGroup], APIProject.class)
} catch (Exception e) { } catch (Exception e) {
System.out.println(e.getLocalizedMessage()) System.out.println(e.getLocalizedMessage())
} }
@ -488,7 +491,7 @@ class TestDroidUpload extends TestServer {
user.shareFile(testedId, accessGroup) user.shareFile(testedId, accessGroup)
new URL(RUNNER_GATEWAY + "?apk=" + testedId + "&test=" + testId + "&buildno=" + buildNumber). new URL(RUNNER_GATEWAY + "?apk=" + testedId + "&test=" + testId + "&buildno=" + buildNumber).
getText() getText()
} }
@Override @Override

4
app/src/main/java/org/kiwix/kiwixmobile/utils/files/FileUtils.kt
View File

@ -36,8 +36,8 @@ import java.util.ArrayList
object FileUtils { object FileUtils {
val saveFilePath = val saveFilePath =
"${Environment.getExternalStorageDirectory()}${File.separator}Android$" + "${Environment.getExternalStorageDirectory()}${File.separator}Android" +
"{File.separator}obb${File.separator}${BuildConfig.APPLICATION_ID}" "${File.separator}obb${File.separator}${BuildConfig.APPLICATION_ID}"
@JvmStatic fun getFileCacheDir(context: Context): File = @JvmStatic fun getFileCacheDir(context: Context): File =
if (Environment.MEDIA_MOUNTED == Environment.getExternalStorageState()) { if (Environment.MEDIA_MOUNTED == Environment.getExternalStorageState()) {