Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit d9d8db4

Browse files
committed
Merge branch 'release/0.8.18'
2 parents dc28098 + 580647a commit d9d8db4

File tree

151 files changed

+3302
-1913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+3302
-1913
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ script:
4848
- ./gradlew testAppReleaseUnitTest --stacktrace
4949
- ./tools/check/check_code_quality.sh
5050
- ./tools/travis/check_pr.sh
51+
# Check that indonesians file are identical. Due to Android issue, the resource folder must be value-in/, and Weblate export data into value-id/.
52+
- diff ./vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-in/strings.xml

CHANGES.rst

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
Changes in Riot 0.8.18 (2018-XX-XX)
2+
===================================================
3+
4+
MatrixSdk:
5+
- Upgrade to version 0.9.12.
6+
7+
Features:
8+
- Status.im theme
9+
10+
Improvements:
11+
- Use LocalBroadcastManager when applicable (#2595)
12+
- Menu version copies version number to clipboard (#2570)
13+
- Tapping on profile picture in sidebar opens settings page (#2597)
14+
- Ask for Camera permission only when the user want to change the room avatar (#2575)
15+
16+
Other changes:
17+
- Room display name is now computed by the Matrix SDK
18+
19+
Bugfix:
20+
- When exporting E2E keys, it isn't clear that you are creating a new password (#2626)
21+
- Can't change room directory server (#2611)
22+
- Reply get's lost when moving app in background and back (#2581)
23+
- Android 8: crash on device Boot (#2615)
24+
- Avoid creation of Gson object (#2608)
25+
- Inline code breaks in reply messages (#2531)
26+
- Reduce size of clickable read-receipts area (#655)
27+
- Fix issue of html rendering in emote message (#2652)
28+
29+
Translations:
30+
- Fix issue with indonesian translations. This language is now available.
31+
132
Changes in Riot 0.8.17 (2018-10-10)
233
===================================================
334

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ buildscript {
2323

2424
// global properties used in sub modules
2525
ext {
26-
versionCodeProp = 81700
27-
versionNameProp = "0.8.17"
26+
versionCodeProp = 81800
27+
versionNameProp = "0.8.18"
2828
versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
2929
buildNumberProp = "${versionBuild}"
3030
}

tools/check/forbidden_strings_in_code.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,7 @@ android\.app\.AlertDialog
148148
### Put the operator at the beginning of next line
149149
&&$
150150
\|\|$
151-
==$
151+
==$
152+
153+
### Use JsonUtils.getBasicGson()
154+
new Gson\(\)

tools/tests/test_boot_complete.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Test boot complete broadcast
2+
3+
adb shell am broadcast -a android.intent.action.ACTION_BOOT_COMPLETED -c android.intent.category.HOME -n im.vector.alpha/im.vector.receiver.VectorBootReceiver
File renamed without changes.

vector/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ android {
115115
disable 'MissingTranslation'
116116
disable 'RestrictedApi'
117117
disable 'ImpliedQuantity'
118+
119+
// Treat some warnings as errors
120+
error 'StringFormatCount'
121+
error 'HardcodedText'
122+
error 'SpUsage'
118123
}
119124

120125
repositories {

vector/libs/matrix-sdk.aar

9.27 KB
Binary file not shown.

vector/src/app/java/im/vector/gcm/MatrixGcmListenerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private void onMessageReceivedInternal(final Map<String, String> data) {
131131
if ((null != session) && session.getDataHandler().getStore().isReady()) {
132132
Room room = session.getDataHandler().getStore().getRoom(roomId);
133133
if (null != room) {
134-
roomName = VectorUtils.getRoomDisplayName(this, session, room);
134+
roomName = room.getRoomDisplayName(this);
135135
}
136136
}
137137
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
The aim of this file is to test the different themes of Riot
5+
-->
6+
7+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent"
10+
android:orientation="vertical">
11+
12+
<TextView
13+
android:layout_width="match_parent"
14+
android:layout_height="20dp"
15+
android:background="?attr/primary_dark_color"
16+
android:gravity="center_vertical"
17+
android:text="Status Bar" />
18+
19+
<TextView
20+
android:layout_width="match_parent"
21+
android:layout_height="40dp"
22+
android:background="?attr/primary_color"
23+
android:gravity="center_vertical"
24+
android:text="This is a simple text" />
25+
26+
</LinearLayout>

0 commit comments

Comments
 (0)