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

Commit bfe46a8

Browse files
bmartybmarty
committed
Merge branch 'release/0.8.20'
2 parents 47e7ad4 + 69d36c0 commit bfe46a8

File tree

242 files changed

+7641
-5898
lines changed

Some content is hidden

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

242 files changed

+7641
-5898
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
### Pull Request Checklist
2+
3+
<!-- Please read CONTRIBUTING.rst before submitting your pull request -->
4+
5+
* [ ] Pull request is based on the develop branch
6+
* [ ] Pull request updates [CHANGES.rst](https://github.com/vector-im/riot-android/blob/develop/CHANGES.rst)
7+
* [ ] Pull request includes screenshots or videos if containing UI changes
8+
* [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst#sign-off)

‎CHANGES.rst

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,25 @@
1-
Changes in Riot 0.8.19 (2018-XX-XX)
1+
Changes in Riot 0.8.20 (2018-12-13)
2+
===================================================
3+
4+
MatrixSdk:
5+
- Upgrade to version 0.9.14.
6+
7+
Improvements:
8+
- Remove double negations from settings and update descriptions (#2723)
9+
- Handle missing or bad parameter in slash command
10+
- Support specifying kick and ban message (#2164)
11+
- Add image transparency and fix issues with gifs in the media viewer (#2731)
12+
- Upgrade olm-sdk.aar from version 2.3.0 to version 3.0.0
13+
- Migration to the Preference v7 support
14+
- Make User Agreement part of the registration flow (#2442)
15+
- Fix several color issue on Status theme and prepare rework some styles.
16+
17+
Bugfix:
18+
- Use same "Call Anyway" string from iOS (#2695)
19+
- Improve `/markdown` command (#2673)
20+
- Display thumbnail for encrypted files without a remote thumbnail (#2734)
21+
22+
Changes in Riot 0.8.19 (2018-11-06)
223
===================================================
324

425
MatrixSdk:
@@ -1074,3 +1095,32 @@ Changes in Vector 0.2.0 (2016-04-14)
10741095
* First official release.
10751096

10761097

1098+
=======================================================
1099+
+ TEMPLATE WHEN PREPARING A NEW RELEASE +
1100+
=======================================================
1101+
1102+
1103+
Changes in Riot 0.8.XX (2018-XX-XX)
1104+
===================================================
1105+
1106+
MatrixSdk:
1107+
- Upgrade to version 0.X.Y.
1108+
1109+
Features:
1110+
-
1111+
1112+
Improvements:
1113+
-
1114+
1115+
Other changes:
1116+
-
1117+
1118+
Bugfix:
1119+
-
1120+
1121+
Translations:
1122+
-
1123+
1124+
Build:
1125+
-
1126+

‎build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
ext.kotlin_version = '1.2.30'
55

66
repositories {
7-
jcenter()
87
google()
8+
jcenter()
99
maven {
1010
url "https://plugins.gradle.org/m2/"
1111
}
@@ -23,20 +23,22 @@ buildscript {
2323

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

3232
allprojects {
3333
repositories {
34+
google()
3435
jcenter()
35-
3636
maven {
3737
url "https://maven.google.com"
3838
}
39-
google()
39+
maven {
40+
url "https://jitpack.io"
41+
}
4042
}
4143
}
4244

‎tools/check/forbidden_strings_in_resources.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,11 @@ DO NOT COMMIT
7070
layout_constraintRight_
7171
layout_constraintLeft_
7272

73+
### Use Preference from v7 library (android.support.v7.preference.PreferenceScreen)
74+
<PreferenceScreen
75+
76+
### Use im.vector.preference.VectorSwitchPreference to support multiline of the title
77+
<SwitchPreference
78+
79+
### Use im.vector.preference.VectorPreference to support multiline of the title
80+
<Preference\n

‎vector/build.gradle

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,21 @@ repositories {
55
apply plugin: 'com.android.application'
66
apply plugin: 'kotlin-android'
77
apply plugin: 'kotlin-kapt'
8+
apply plugin: 'realm-android'
9+
10+
buildscript {
11+
repositories {
12+
jcenter()
13+
}
14+
15+
dependencies {
16+
classpath "io.realm:realm-gradle-plugin:5.8.0"
17+
}
18+
}
19+
20+
kapt {
21+
correctErrorTypes = true
22+
}
823

924
android {
1025
compileSdkVersion 27
@@ -15,6 +30,11 @@ android {
1530
exclude 'META-INF/NOTICE'
1631
}
1732

33+
compileOptions {
34+
sourceCompatibility JavaVersion.VERSION_1_8
35+
targetCompatibility JavaVersion.VERSION_1_8
36+
}
37+
1838
defaultConfig {
1939
applicationId "im.vector"
2040
minSdkVersion 16
@@ -178,6 +198,7 @@ dependencies {
178198

179199
// Kotlin coroutines
180200
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.2'
201+
implementation "org.jetbrains.anko:anko-commons:0.10.8"
181202

182203
implementation 'com.android.support:multidex:1.0.0'
183204

@@ -187,13 +208,20 @@ dependencies {
187208
implementation 'com.android.support:design:27.1.1'
188209
implementation 'com.android.support:cardview-v7:27.1.1'
189210
implementation 'com.android.support:recyclerview-v7:27.1.1'
211+
implementation 'com.android.support:preference-v7:27.1.1'
212+
implementation 'com.android.support:preference-v14:27.1.1'
190213
implementation 'com.jakewharton:butterknife:8.5.1'
191214
kapt 'com.jakewharton:butterknife-compiler:8.5.1'
192215

193216
// UI
194217
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
195218
implementation 'com.getbase:floatingactionbutton:1.10.1'
196219
implementation 'com.binaryfork:spanny:1.0.4'
220+
implementation 'com.github.chrisbanes:PhotoView:2.1.4'
221+
222+
// Epoxy (without androidx packages)
223+
implementation 'com.airbnb.android:epoxy:2.19.0'
224+
kapt 'com.airbnb.android:epoxy-processor:2.19.0'
197225

198226
// Network
199227
implementation 'com.squareup.retrofit2:retrofit:2.4.0'

‎vector/libs/matrix-sdk.aar

286 KB
Binary file not shown.

‎vector/libs/olm-sdk.aar

4.65 KB
Binary file not shown.

‎vector/src/debug/java/im/vector/receiver/DebugReceiver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package im.vector.receiver
1818

1919
import android.content.*
20-
import android.preference.PreferenceManager
20+
import android.support.v7.preference.PreferenceManager
2121
import android.util.Log
2222
import androidx.core.content.edit
2323
import im.vector.Matrix

‎vector/src/debug/res/layout/demo_themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent"
1111
android:orientation="vertical"
12-
android:theme="@style/Theme.AppCompat.Light">
12+
android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
1313

1414
<FrameLayout
1515
android:layout_width="match_parent"

‎vector/src/main/AndroidManifest.xml

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -126,25 +126,27 @@
126126
</intent-filter>
127127
</activity>
128128
<activity
129-
android:name=".activity.AccountCreationActivity"
129+
android:name=".activity.FallbackAccountCreationActivity"
130130
android:configChanges="orientation|screenSize"
131131
android:label="@string/create_account" />
132132
<activity
133133
android:name=".activity.AccountCreationCaptchaActivity"
134134
android:configChanges="orientation|screenSize"
135135
android:label="@string/create_account" />
136+
<activity
137+
android:name=".activity.policies.AccountCreationTermsActivity"
138+
android:configChanges="orientation|screenSize"
139+
android:label="@string/create_account" />
136140
<activity
137141
android:name=".activity.FallbackLoginActivity"
138142
android:configChanges="orientation|screenSize"
139143
android:label="@string/login" />
140144
<activity
141145
android:name=".activity.SplashActivity"
142-
android:configChanges="orientation|screenSize"
143-
android:theme="@style/AppTheme.NoActionBar.Light" />
146+
android:configChanges="orientation|screenSize" />
144147
<activity
145148
android:name=".activity.LoggingOutActivity"
146-
android:configChanges="orientation|screenSize"
147-
android:theme="@style/AppTheme.NoActionBar.Light" />
149+
android:configChanges="orientation|screenSize" />
148150
<activity
149151
android:name=".activity.VectorHomeActivity"
150152
android:configChanges="orientation|screenSize"
@@ -162,11 +164,8 @@
162164
android:name=".activity.VectorRoomActivity"
163165
android:configChanges="orientation|screenSize"
164166
android:label="@string/title_activity_room"
165-
android:theme="@style/AppTheme.NoActionBar.Light"
166167
android:windowSoftInputMode="stateHidden|adjustResize" />
167-
<activity
168-
android:name=".activity.DeactivateAccountActivity"
169-
android:theme="@style/AppTheme.NoActionBar.Light" />
168+
<activity android:name=".activity.DeactivateAccountActivity" />
170169
<activity
171170
android:name=".activity.VectorRoomCreationActivity"
172171
android:configChanges="orientation|screenSize"
@@ -203,8 +202,7 @@
203202
android:name=".activity.VectorMemberDetailsActivity"
204203
android:configChanges="orientation|screenSize"
205204
android:label="@string/title_activity_member_details"
206-
android:parentActivityName=".activity.VectorRoomActivity"
207-
android:theme="@style/AppTheme.NoActionBar.Light">
205+
android:parentActivityName=".activity.VectorRoomActivity">
208206
<meta-data
209207
android:name="android.support.PARENT_ACTIVITY"
210208
android:value="im.vector.activity.VectorRoomActivity" />
@@ -250,12 +248,10 @@
250248
android:theme="@style/AppTheme.NoActionBar.FullScreen.Light" />
251249
<activity
252250
android:name=".activity.IntegrationManagerActivity"
253-
android:configChanges="orientation|screenSize"
254-
android:theme="@style/AppTheme.NoActionBar.Light" />
251+
android:configChanges="orientation|screenSize" />
255252
<activity
256253
android:name=".activity.StickerPickerActivity"
257-
android:configChanges="orientation|screenSize"
258-
android:theme="@style/AppTheme.NoActionBar.Light" />
254+
android:configChanges="orientation|screenSize" />
259255
<activity
260256
android:name=".activity.VectorMediasPickerActivity"
261257
android:label="@string/media_picker_both_capture_title"
@@ -363,8 +359,7 @@
363359
<activity
364360
android:name=".activity.PhoneNumberAdditionActivity"
365361
android:configChanges="orientation|screenSize"
366-
android:label="@string/settings_add_phone_number"
367-
android:theme="@style/AppTheme.NoActionBar.Light" />
362+
android:label="@string/settings_add_phone_number" />
368363
<activity
369364
android:name=".activity.CountryPickerActivity"
370365
android:configChanges="orientation|screenSize"
@@ -378,26 +373,20 @@
378373
<activity
379374
android:name=".activity.RoomDirectoryPickerActivity"
380375
android:configChanges="orientation|screenSize"
381-
android:label="@string/select_room_directory"
382-
android:theme="@style/DirectoryPickerTheme.Light" />
376+
android:label="@string/select_room_directory" />
383377
<activity
384378
android:name=".activity.PhoneNumberVerificationActivity"
385379
android:configChanges="orientation|screenSize"
386-
android:label="@string/settings_phone_number_verification"
387-
android:theme="@style/AppTheme.NoActionBar.Light" />
380+
android:label="@string/settings_phone_number_verification" />
388381
<activity
389382
android:name=".activity.NotificationPrivacyActivity"
390383
android:configChanges="orientation|screenSize"
391-
android:label="@string/settings_notification_privacy"
392-
android:theme="@style/AppTheme.NoActionBar.Light" />
393-
<activity
394-
android:name=".activity.VectorWebViewActivity"
395-
android:theme="@style/AppTheme.NoActionBar.Light" />
384+
android:label="@string/settings_notification_privacy" />
385+
<activity android:name=".activity.VectorWebViewActivity" />
396386

397387
<activity
398388
android:name="im.vector.activity.MediaPreviewerActivity"
399-
android:configChanges="orientation|screenSize"
400-
android:theme="@style/AppTheme.NoActionBar.Light" />
389+
android:configChanges="orientation|screenSize" />
401390

402391
<!-- FileProvider -->
403392
<provider

‎vector/src/main/assets/open_source_licenses.html

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,21 @@ <h3>
284284
<br/>
285285
Copyright 2015 Pavlovsky Ivan
286286
</li>
287-
288-
287+
<li>
288+
<b>PhotoView</b>
289+
<br/>
290+
Copyright 2018 Chris Banes
291+
</li>
292+
<li>
293+
<b>Epoxy</b>
294+
<br/>
295+
Copyright 2016 Airbnb, Inc.
296+
</li>
297+
<li>
298+
<b>Anko</b>
299+
<br/>
300+
Copyright 2016 JetBrains s.r.o.
301+
</li>
289302
</ul>
290303
<pre>
291304
Apache License
@@ -464,4 +477,4 @@ <h3>
464477
of your accepting any such warranty or additional liability.
465478
</pre>
466479
</body>
467-
</html>
480+
</html>

‎vector/src/main/java/im/vector/Matrix.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,11 @@
3737
import org.matrix.androidsdk.data.store.IMXStore;
3838
import org.matrix.androidsdk.data.store.MXFileStore;
3939
import org.matrix.androidsdk.db.MXLatestChatMessageCache;
40-
import org.matrix.androidsdk.db.MXMediasCache;
40+
import org.matrix.androidsdk.db.MXMediaCache;
4141
import org.matrix.androidsdk.listeners.IMXNetworkEventListener;
4242
import org.matrix.androidsdk.listeners.MXEventListener;
4343
import org.matrix.androidsdk.rest.callback.ApiCallback;
4444
import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
45-
import org.matrix.androidsdk.rest.client.LoginRestClient;
4645
import org.matrix.androidsdk.rest.model.Event;
4746
import org.matrix.androidsdk.rest.model.MatrixError;
4847
import org.matrix.androidsdk.rest.model.login.Credentials;
@@ -417,9 +416,9 @@ public static void removeSessionErrorListener(Activity activity) {
417416
*
418417
* @return the mediasCache.
419418
*/
420-
public MXMediasCache getMediasCache() {
419+
public MXMediaCache getMediaCache() {
421420
if (getSessions().size() > 0) {
422-
return getSessions().get(0).getMediasCache();
421+
return getSessions().get(0).getMediaCache();
423422
}
424423
return null;
425424
}
@@ -489,7 +488,7 @@ public void deactivateSession(final Context context,
489488
final @NonNull ApiCallback<Void> aCallback) {
490489
Log.d(LOG_TAG, "## deactivateSession() " + session.getMyUserId());
491490

492-
session.deactivateAccount(context, LoginRestClient.LOGIN_FLOW_TYPE_PASSWORD, userPassword, eraseUserData, new SimpleApiCallback<Void>(aCallback) {
491+
session.deactivateAccount(context, userPassword, eraseUserData, new SimpleApiCallback<Void>(aCallback) {
493492
@Override
494493
public void onSuccess(Void info) {
495494
mLoginStorage.removeCredentials(session.getHomeServerConfig());

0 commit comments

Comments
 (0)