This repository has been archived by the owner on Apr 12, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '9a58eac616437ccc67dfce105add1445b8bf29e5' into develop
# Conflicts: # build.gradle # vector/build.gradle # vector/libs/matrix-sdk.aar # vector/src/main/AndroidManifest.xml # vector/src/main/assets/open_source_licenses.html # vector/src/main/java/im/vector/Matrix.java # vector/src/main/java/im/vector/VectorApp.java # vector/src/main/java/im/vector/activity/CommonActivityUtils.java # vector/src/main/java/im/vector/activity/FallbackLoginActivity.java # vector/src/main/java/im/vector/activity/LoginActivity.java # vector/src/main/java/im/vector/activity/RiotAppCompatActivity.kt # vector/src/main/java/im/vector/activity/SplashActivity.java # vector/src/main/java/im/vector/activity/VectorHomeActivity.java # vector/src/main/java/im/vector/activity/VectorMediasPickerActivity.java # vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java # vector/src/main/java/im/vector/activity/VectorRoomActivity.java # vector/src/main/java/im/vector/activity/VectorRoomCreationActivity.java # vector/src/main/java/im/vector/activity/VectorRoomDetailsActivity.java # vector/src/main/java/im/vector/activity/VectorRoomInviteMembersActivity.java # vector/src/main/java/im/vector/activity/VectorSettingsActivity.java # vector/src/main/java/im/vector/activity/VectorSharedFilesActivity.java # vector/src/main/java/im/vector/adapters/AdapterSection.java # vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java # vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java # vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java # vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java # vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java # vector/src/main/java/im/vector/adapters/VectorSearchFilesListAdapter.java # vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java # vector/src/main/java/im/vector/fragments/AbsHomeFragment.java # vector/src/main/java/im/vector/fragments/HomeFragment.java # vector/src/main/java/im/vector/fragments/PeopleFragment.java # vector/src/main/java/im/vector/fragments/RoomsFragment.java # vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java # vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java # vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java # vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java # vector/src/main/java/im/vector/fragments/VectorSearchRoomsFilesListFragment.java # vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.java # vector/src/main/java/im/vector/receiver/VectorRegistrationReceiver.java # vector/src/main/java/im/vector/util/PreferencesManager.java # vector/src/main/java/im/vector/util/RageShake.java # vector/src/main/java/im/vector/util/RoomUtils.java # vector/src/main/java/im/vector/util/SlashCommandsParser.java # vector/src/main/java/im/vector/util/ThemeUtils.java # vector/src/main/java/im/vector/util/VectorUtils.java # vector/src/main/res/drawable-hdpi/message_notification_transparent.png # vector/src/main/res/drawable-hdpi/permanent_notification_transparent.png # vector/src/main/res/drawable-mdpi/message_notification_transparent.png # vector/src/main/res/drawable-mdpi/permanent_notification_transparent.png # vector/src/main/res/drawable-xhdpi/message_notification_transparent.png # vector/src/main/res/drawable-xhdpi/permanent_notification_transparent.png # vector/src/main/res/drawable-xxhdpi/logo_transparent.png # vector/src/main/res/drawable-xxhdpi/message_notification_transparent.png # vector/src/main/res/drawable-xxhdpi/permanent_notification_transparent.png # vector/src/main/res/drawable-xxxhdpi/message_notification_transparent.png # vector/src/main/res/drawable-xxxhdpi/permanent_notification_transparent.png # vector/src/main/res/layout/activity_home.xml # vector/src/main/res/layout/activity_vector_login.xml # vector/src/main/res/layout/activity_vector_medias_picker.xml # vector/src/main/res/layout/activity_vector_registration_captcha.xml # vector/src/main/res/layout/activity_vector_room.xml # vector/src/main/res/layout/adapter_item_vector_add_participants.xml # vector/src/main/res/layout/vector_activity_splash.xml # vector/src/main/res/layout/vector_home_menu_header.xml # vector/src/main/res/menu/vector_home_sliding_menu.xml # vector/src/main/res/values-fr/strings.xml # vector/src/main/res/values/colors.xml # vector/src/main/res/values/strings.xml # vector/src/main/res/xml/vector_room_settings_preferences.xml # vector/src/main/res/xml/vector_settings_preferences.xml
- Loading branch information
Showing
326 changed files
with
18,084 additions
and
12,589 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,3 +11,5 @@ | |
|
|
||
| .gradle | ||
| /local.properties | ||
|
|
||
| /tmp | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #!/bin/bash | ||
|
|
||
| echo "Save current dir" | ||
| currentDir=`pwd` | ||
|
|
||
| echo "up dir" | ||
| cd .. | ||
|
|
||
| echo "remove sdk folder" | ||
| rm -rf matrix-android-sdk | ||
|
|
||
| echo "clone the matrix-android-sdk repository, and checkout develop branch" | ||
| git clone -b develop https://github.com/matrix-org/matrix-android-sdk | ||
|
|
||
| cd matrix-android-sdk | ||
|
|
||
| echo "Build matrix sdk from source" | ||
| ./gradlew clean assembleRelease | ||
|
|
||
| cd ${currentDir} | ||
|
|
||
| echo "Copy freshly built matrix sdk to the libs folder" | ||
| # Ensure the lib is updated by removing the previous one | ||
| rm vector/libs/matrix-sdk.aar | ||
|
|
||
| cp ../matrix-android-sdk/matrix-sdk/build/outputs/aar/matrix-sdk-release-*.aar vector/libs/matrix-sdk.aar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # | ||
| # Copyright 2018 New Vector Ltd | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| ####################################################################################################################### | ||
| # Check drawable quantity | ||
| ####################################################################################################################### | ||
|
|
||
| echo "Check drawable quantity" | ||
|
|
||
| numberOfFiles1=`ls -1U ./vector/src/main/res/drawable-hdpi | wc -l | sed "s/ //g"` | ||
| numberOfFiles2=`ls -1U ./vector/src/main/res/drawable-mdpi | wc -l | sed "s/ //g"` | ||
| numberOfFiles3=`ls -1U ./vector/src/main/res/drawable-xhdpi | wc -l | sed "s/ //g"` | ||
| numberOfFiles4=`ls -1U ./vector/src/main/res/drawable-xxhdpi | wc -l | sed "s/ //g"` | ||
| numberOfFiles5=`ls -1U ./vector/src/main/res/drawable-xxxhdpi | wc -l | sed "s/ //g"` | ||
|
|
||
| if [ ${numberOfFiles1} -eq ${numberOfFiles5} ] && [ ${numberOfFiles2} -eq ${numberOfFiles5} ] && [ ${numberOfFiles3} -eq ${numberOfFiles5} ] && [ ${numberOfFiles4} -eq ${numberOfFiles5} ]; then | ||
| resultNbOfDrawable=0 | ||
| echo "OK" | ||
| else | ||
| resultNbOfDrawable=1 | ||
| # DISABLE for the moment | ||
| resultNbOfDrawable=0 | ||
| echo "ERROR, missing drawable alternative." | ||
| fi | ||
|
|
||
| echo | ||
|
|
||
| ####################################################################################################################### | ||
| # Search forbidden pattern | ||
| ####################################################################################################################### | ||
|
|
||
| searchForbiddenStringsScript=./tmp/search_forbidden_strings.pl | ||
|
|
||
| if [ -f ${searchForbiddenStringsScript} ]; then | ||
| echo "${searchForbiddenStringsScript} already there" | ||
| else | ||
| mkdir tmp | ||
| echo "Get the script" | ||
| wget https://raw.githubusercontent.com/matrix-org/matrix-dev-tools/develop/bin/search_forbidden_strings.pl -O ${searchForbiddenStringsScript} | ||
| fi | ||
|
|
||
| if [ -x ${searchForbiddenStringsScript} ]; then | ||
| echo "${searchForbiddenStringsScript} is already executable" | ||
| else | ||
| echo "Make the script executable" | ||
| chmod u+x ${searchForbiddenStringsScript} | ||
| fi | ||
|
|
||
| echo | ||
| echo "Search for forbidden patterns in code..." | ||
|
|
||
| ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_code.txt \ | ||
| ./vector/src/app/java \ | ||
| ./vector/src/appfdroid/java \ | ||
| ./vector/src/main/java | ||
|
|
||
| resultForbiddenStringInCode=$? | ||
|
|
||
| echo | ||
| echo "Search for forbidden patterns in resources..." | ||
|
|
||
| ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_resources.txt \ | ||
| ./vector/src/main/res/anim \ | ||
| ./vector/src/main/res/color \ | ||
| ./vector/src/main/res/menu \ | ||
| ./vector/src/main/res/layout \ | ||
| ./vector/src/main/res/values \ | ||
| ./vector/src/main/res/values-v21 \ | ||
| ./vector/src/main/res/values-w820dp \ | ||
| ./vector/src/main/res/xml | ||
|
|
||
| resultForbiddenStringInResource=$? | ||
|
|
||
| ####################################################################################################################### | ||
| # Check files with long lines | ||
| ####################################################################################################################### | ||
|
|
||
| checkLongFilesScript=./tmp/check_long_files.pl | ||
|
|
||
| if [ -f ${checkLongFilesScript} ]; then | ||
| echo "${checkLongFilesScript} already there" | ||
| else | ||
| mkdir tmp | ||
| echo "Get the script" | ||
| wget https://raw.githubusercontent.com/matrix-org/matrix-dev-tools/develop/bin/check_long_files.pl -O ${checkLongFilesScript} | ||
| fi | ||
|
|
||
| if [ -x ${checkLongFilesScript} ]; then | ||
| echo "${checkLongFilesScript} is already executable" | ||
| else | ||
| echo "Make the script executable" | ||
| chmod u+x ${checkLongFilesScript} | ||
| fi | ||
|
|
||
| echo | ||
| echo "Search for long files..." | ||
|
|
||
| # TODO Decrease this limit in a near future... | ||
| ${checkLongFilesScript} 4100 \ | ||
| ./vector/src/app/java \ | ||
| ./vector/src/appfdroid/java \ | ||
| ./vector/src/main/java \ | ||
| ./vector/src/main/res/layout \ | ||
| ./vector/src/main/res/menu \ | ||
| ./vector/src/main/res/values \ | ||
| ./vector/src/main/res/values-v21 \ | ||
| ./vector/src/main/res/values-w820dp | ||
|
|
||
| resultLongFiles=$? | ||
|
|
||
| ####################################################################################################################### | ||
| # search png in drawable folder | ||
| ####################################################################################################################### | ||
|
|
||
| echo | ||
| echo "Search for png files in /drawable..." | ||
|
|
||
| ls -1U ./vector/src/main/res/drawable/*.png | ||
| resultTmp=$? | ||
|
|
||
| # Inverse the result, cause no file found is an error for ls but this is what we want! | ||
| if [ ${resultTmp} -eq 0 ]; then | ||
| echo "ERROR, png files detected in /drawable" | ||
| resultPngInDrawable=1 | ||
| else | ||
| echo "OK" | ||
| resultPngInDrawable=0 | ||
| fi | ||
|
|
||
| echo | ||
|
|
||
| if [ ${resultNbOfDrawable} -eq 0 ] && [ ${resultForbiddenStringInCode} -eq 0 ] && [ ${resultForbiddenStringInResource} -eq 0 ] && [ ${resultLongFiles} -eq 0 ] && [ ${resultPngInDrawable} -eq 0 ]; then | ||
| echo "MAIN OK" | ||
| else | ||
| echo "MAIN ERROR" | ||
| exit 1 | ||
| fi |
Oops, something went wrong.