Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Set https://localhost default identity server #27

Merged
merged 4 commits into from
Jul 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
73 changes: 36 additions & 37 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,55 +1,54 @@
# FTR: Configuration on https://travis-ci.org/vector-im/riot-android/settings
#
# - Build only if .travis.yml is present -> On
# - Limit concurrent jobs -> Off
# - Build pushed branches -> On (build the branch)
# - Build pushed pull request -> On (build the PR after auto-merge)
#
# - Auto cancel branch builds -> On
# - Auto cancel pull request builds -> On

language: android
dist: trusty
sudo: required
jdk: oraclejdk8
sudo: false

notifications:
email: false
env:
global:
- ANDROID_API_LEVEL=28
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
- ANDROID_ABI=armeabi-v7a

android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
- tools
- platform-tools

# The BuildTools version used by your project
- build-tools-28.0.3

# The SDK version used to compile your project
- android-28
- extra-android-m2repository
licenses:
- 'android-sdk-preview-license-52d11cd2'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

before_install:
- touch $HOME/.android/repositories.cfg
- yes | sdkmanager "platforms;android-28"
- yes | sdkmanager "build-tools;28.0.3"
- yes | sdkmanager "ndk-bundle"

before_cache:
- rm -fr $HOME/.gradle/caches
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
# Travis is not happy with gradle cache (getting permission denied)
# - $HOME/.gradle/caches/
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache

# Build with the development SDK
before_script:
- /bin/sh ./set_debug_env.sh
- chmod +x gradlew

# Just build the project for now
script:
# Build app (assembleAppRelease assembleAppfdroidRelease)
# Build Android test (assembleAndroidTest)
# Code quality (lintAppRelease lintAppfdroidRelease)
- ./gradlew clean assembleAppRelease assembleAppfdroidRelease assembleAndroidTest lintAppRelease lintAppfdroidRelease --stacktrace
# Run unitary test (Disable for now, see https://travis-ci.org/vector-im/riot-android/builds/502504370)
# - ./gradlew testAppReleaseUnitTest --stacktrace
# Other code quality check
- ./tools/check/check_code_quality.sh
- ./tools/travis/check_pr.sh
# Check that indonesians file are identical. Due to Android issue, the resource folder must be value-in/, and Weblate export data into value-id/.
- diff ./vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-in/strings.xml
- ./gradlew assembleAppDebug

deploy:
provider: releases
file: "vector/build/outputs/apk/app/debug/vector-app-debug.apk"
skip_cleanup: true
draft: true
on:
branch: patch-1
api_key:
secure: "qh/v61K0ZP/C29FG57JC3sPeVlJw3D2VXA+M5sym+GMR5mOQd3RkofB4kdSwma0zj6AiEVaTBZ+VWnadLBAOW9avz7BqS2MUn8EbU8dAunwuHiyoMwfq4hPofolt7ftpOO5PaBb3pBYcJdld/94ai+yix11IpxShvM/li5AS+XnAYYne4NQ82GedftPl4pdMsbtla0CBD3lmg1GZzJNALZUvvoxE9lXwkRfPT7bq6pGM+yHkCrCYpIjIyuSCGi5bV6d5uAz8XPXL6C20Gd/kaI47OrkyMvVMZJwCQMSlycwOtiPIv6hWX4v8yb1NQ7NtlHOREM/JwMaDhyeCLwLP+uGDfshA96xD+9z4glySYbxn50orc/DRD6QkfBJW219KTcMRHtueR7VZZl0K1vMjmEzioP6mabyrsZE96fxxJAMBfwgsrozb/gHtHRimoHcs3R4rNu8CLgjolKTesdkhSvbSjasUotKqP9OXE+8kSqojToRQurmnRqcYTpORlOi1/8DTaEoXZu4fDKgOwod2N3fvxK5sxp66yF9yWC+76yR0UMU8sL/ZXVUoO5q3Duteqqk5GytQkUREsQO46cPaUEJY3/tBS9YCeTcPiaM4veOaWZGEkds4jPbromUpa/GFhj8/vEmC4QYZ/U/u9tU8a7IgDwqd5GaWDCuGED5YvfY="
hrj marked this conversation as resolved.
Show resolved Hide resolved

4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ allprojects {
url 'https://jitpack.io'
content {
// Use this repo only for matrix SDK library
includeGroupByRegex "com\\.github\\.matrix-org"
includeGroupByRegex "com\\.github\\.Bubu"
// Also add subgroups, due to SDK split into modules
includeGroupByRegex "com\\.github\\.matrix-org\\.matrix-android-sdk"
includeGroupByRegex "com\\.github\\.Bubu\\.matrix-android-sdk"
// And Olm library
includeGroupByRegex "org\\.matrix\\.gitlab\\.matrix-org"
// And PhotoView
Expand Down
1 change: 1 addition & 0 deletions vector/src/main/java/im/vector/activity/LoginActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ public void onClick(View view) {
}
});

mUseCustomHomeServersCheckbox.setChecked(true);
mUseCustomHomeServersCheckbox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/res/values/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<string name="vector_im_server_url" translatable="false">https://vector.im</string>
<string name="matrix_org_server_url" translatable="false">https://matrix.org</string>
<string name="default_hs_server_url" translatable="false">https://matrix.org</string>
<string name="default_identity_server_url" translatable="false">https://vector.im</string>
<string name="default_identity_server_url" translatable="false">https://localhost</string>
<string name="matomo_server_url" translatable="false">https://matomo.riot.im</string>
<string name="matomo_site_id" translatable="false">1</string>
<string name="matomo_tracker_name" translatable="false">AndroidMatomoTracker</string>
Expand Down