From 3dd161d65a7139ec8a19944fe1bf3ac35ec10300 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 11 Jun 2019 16:54:44 +0200 Subject: [PATCH 1/3] Sync: add progress indicator for sync, need UI inputs. --- .../java/im/vector/matrix/rx/RxSession.kt | 5 ++ .../matrix/android/api/session/Session.kt | 9 +++ .../android/api/session/sync/SyncState.kt | 27 +++++++ .../internal/session/DefaultSession.kt | 5 ++ .../internal/session/sync/job/SyncThread.kt | 73 ++++++++++--------- .../features/home/HomeDetailFragment.kt | 6 ++ .../features/home/HomeDetailViewModel.kt | 18 ++++- .../features/home/HomeDetailViewState.kt | 4 +- .../main/res/layout/fragment_home_detail.xml | 15 +++- 9 files changed, 123 insertions(+), 39 deletions(-) create mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt index 96cddf7d..4205b049 100644 --- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt +++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt @@ -19,6 +19,7 @@ package im.vector.matrix.rx import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.session.room.model.RoomSummary +import im.vector.matrix.android.api.session.sync.SyncState import io.reactivex.Observable class RxSession(private val session: Session) { @@ -31,6 +32,10 @@ class RxSession(private val session: Session) { return session.liveGroupSummaries().asObservable() } + fun liveSyncState(): Observable { + return session.syncState().asObservable() + } + } fun Session.rx(): RxSession { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt index 82264306..6f8d745e 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt @@ -17,6 +17,7 @@ package im.vector.matrix.android.api.session import androidx.annotation.MainThread +import androidx.lifecycle.LiveData import im.vector.matrix.android.api.auth.data.SessionParams import im.vector.matrix.android.api.session.cache.CacheService import im.vector.matrix.android.api.session.content.ContentUploadStateTracker @@ -27,6 +28,7 @@ import im.vector.matrix.android.api.session.room.RoomDirectoryService import im.vector.matrix.android.api.session.room.RoomService import im.vector.matrix.android.api.session.signout.SignOutService import im.vector.matrix.android.api.session.sync.FilterService +import im.vector.matrix.android.api.session.sync.SyncState import im.vector.matrix.android.api.session.user.UserService /** @@ -66,6 +68,12 @@ interface Session : @MainThread fun stopSync() + /** + * This method allows to listen the sync state. + * @return a [LiveData] of [SyncState]. + */ + fun syncState(): LiveData + /** * This method allow to close a session. It does stop some services. */ @@ -102,6 +110,7 @@ interface Session : * The access token is not valid anymore */ fun onInvalidToken() + } } \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt new file mode 100644 index 00000000..eedb8086 --- /dev/null +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/sync/SyncState.kt @@ -0,0 +1,27 @@ +/* + * + * * Copyright 2019 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. + * + */ + +package im.vector.matrix.android.api.session.sync + +sealed class SyncState { + object IDLE : SyncState() + data class RUNNING(val catchingUp: Boolean) : SyncState() + object PAUSED : SyncState() + object KILLING : SyncState() + object KILLED : SyncState() +} \ No newline at end of file diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt index 2b43c15c..e3eb6db1 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt @@ -39,6 +39,7 @@ import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRooms import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol import im.vector.matrix.android.api.session.signout.SignOutService import im.vector.matrix.android.api.session.sync.FilterService +import im.vector.matrix.android.api.session.sync.SyncState import im.vector.matrix.android.api.session.user.UserService import im.vector.matrix.android.api.session.user.model.User import im.vector.matrix.android.api.util.Cancelable @@ -124,6 +125,10 @@ internal class DefaultSession(override val sessionParams: SessionParams) : Sessi isOpen = false } + override fun syncState(): LiveData { + return syncThread.liveState() + } + @MainThread override fun signOut(callback: MatrixCallback) { assert(isOpen) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt index 929b67d6..1c6d0a0f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/job/SyncThread.kt @@ -16,10 +16,13 @@ package im.vector.matrix.android.internal.session.sync.job +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import com.squareup.moshi.JsonEncodingException import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.failure.MatrixError +import im.vector.matrix.android.api.session.sync.SyncState import im.vector.matrix.android.api.util.Cancelable import im.vector.matrix.android.internal.network.NetworkConnectivityChecker import im.vector.matrix.android.internal.session.sync.SyncTask @@ -42,61 +45,52 @@ internal class SyncThread(private val syncTask: SyncTask, private val taskExecutor: TaskExecutor ) : Thread(), NetworkConnectivityChecker.Listener, BackgroundDetectionObserver.Listener { - enum class State { - IDLE, - RUNNING, - PAUSED, - KILLING, - KILLED - } - - private var state: State = State.IDLE + private var state: SyncState = SyncState.IDLE + private var liveState = MutableLiveData() private val lock = Object() private var nextBatch = syncTokenStore.getLastToken() private var cancelableTask: Cancelable? = null - fun restart() { - synchronized(lock) { - if (state != State.PAUSED) { - return@synchronized - } - Timber.v("Resume sync...") + init { + updateStateTo(SyncState.IDLE) + } + fun restart() = synchronized(lock) { + if (state is SyncState.PAUSED) { + Timber.v("Resume sync...") // Retrieve the last token, it may have been deleted in case of a clear cache nextBatch = syncTokenStore.getLastToken() - - state = State.RUNNING + updateStateTo(SyncState.RUNNING(catchingUp = true)) lock.notify() } } - fun pause() { - synchronized(lock) { - if (state != State.RUNNING) { - return@synchronized - } + fun pause() = synchronized(lock) { + if (state is SyncState.RUNNING) { Timber.v("Pause sync...") - state = State.PAUSED + updateStateTo(SyncState.PAUSED) } } - fun kill() { - synchronized(lock) { - Timber.v("Kill sync...") - state = State.KILLING - cancelableTask?.cancel() - lock.notify() - } + fun kill() = synchronized(lock) { + Timber.v("Kill sync...") + updateStateTo(SyncState.KILLING) + cancelableTask?.cancel() + lock.notify() } + fun liveState(): LiveData { + return liveState + } override fun run() { Timber.v("Start syncing...") networkConnectivityChecker.register(this) backgroundDetectionObserver.register(this) - state = State.RUNNING - while (state != State.KILLING) { - if (!networkConnectivityChecker.isConnected() || state == State.PAUSED) { + updateStateTo(SyncState.RUNNING(catchingUp = true)) + + while (state != SyncState.KILLING) { + if (!networkConnectivityChecker.isConnected() || state == SyncState.PAUSED) { Timber.v("Waiting...") synchronized(lock) { lock.wait() @@ -133,7 +127,7 @@ internal class SyncThread(private val syncTask: SyncTask, if (failure is Failure.ServerError && (failure.error.code == MatrixError.UNKNOWN_TOKEN || failure.error.code == MatrixError.MISSING_TOKEN)) { // No token or invalid token, stop the thread - state = State.KILLING + updateStateTo(SyncState.KILLING) } latch.countDown() @@ -141,16 +135,23 @@ internal class SyncThread(private val syncTask: SyncTask, }) .executeBy(taskExecutor) - latch.await() + if (state is SyncState.RUNNING) { + updateStateTo(SyncState.RUNNING(catchingUp = false)) + } } } Timber.v("Sync killed") - state = State.KILLED + updateStateTo(SyncState.KILLED) backgroundDetectionObserver.unregister(this) networkConnectivityChecker.unregister(this) } + private fun updateStateTo(newState: SyncState) { + state = newState + liveState.postValue(newState) + } + override fun onConnect() { synchronized(lock) { lock.notify() diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt index cd47df2d..32adfbd2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt @@ -19,6 +19,7 @@ package im.vector.riotredesign.features.home import android.os.Bundle import android.os.Parcelable import android.view.LayoutInflater +import android.view.View import androidx.core.view.forEachIndexed import androidx.lifecycle.ViewModelProviders import com.airbnb.mvrx.args @@ -26,6 +27,7 @@ import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.google.android.material.bottomnavigation.BottomNavigationItemView import com.google.android.material.bottomnavigation.BottomNavigationMenuView +import im.vector.matrix.android.api.session.sync.SyncState import im.vector.riotredesign.R import im.vector.riotredesign.core.platform.ToolbarConfigurable import im.vector.riotredesign.core.platform.VectorBaseFragment @@ -145,6 +147,10 @@ class HomeDetailFragment : VectorBaseFragment() { unreadCounterBadgeViews[INDEX_CATCHUP].render(UnreadCounterBadgeView.State(it.notificationCountCatchup, it.notificationHighlightCatchup)) unreadCounterBadgeViews[INDEX_PEOPLE].render(UnreadCounterBadgeView.State(it.notificationCountPeople, it.notificationHighlightPeople)) unreadCounterBadgeViews[INDEX_ROOMS].render(UnreadCounterBadgeView.State(it.notificationCountRooms, it.notificationHighlightRooms)) + syncProgressBar.visibility = when (it.syncState) { + is SyncState.RUNNING -> if (it.syncState.catchingUp) View.VISIBLE else View.GONE + else -> View.GONE + } } companion object { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt index 81a8f790..7e2ebb7f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt @@ -18,6 +18,8 @@ package im.vector.riotredesign.features.home import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext +import im.vector.matrix.android.api.session.Session +import im.vector.matrix.rx.rx import im.vector.riotredesign.core.platform.VectorViewModel import org.koin.android.ext.android.get @@ -25,6 +27,7 @@ import org.koin.android.ext.android.get * View model used to update the home bottom bar notification counts */ class HomeDetailViewModel(initialState: HomeDetailViewState, + private val session: Session, private val homeRoomListStore: HomeRoomListObservableStore) : VectorViewModel(initialState) { @@ -33,16 +36,29 @@ class HomeDetailViewModel(initialState: HomeDetailViewState, @JvmStatic override fun create(viewModelContext: ViewModelContext, state: HomeDetailViewState): HomeDetailViewModel? { val homeRoomListStore = viewModelContext.activity.get() - return HomeDetailViewModel(state, homeRoomListStore) + val session = viewModelContext.activity.get() + return HomeDetailViewModel(state, session, homeRoomListStore) } } init { + observeSyncState() observeRoomSummaries() } // PRIVATE METHODS ***************************************************************************** + private fun observeSyncState() { + session.rx() + .liveSyncState() + .subscribe { syncState -> + setState { + copy(syncState = syncState) + } + } + .disposeOnClear() + } + private fun observeRoomSummaries() { homeRoomListStore .observe() diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt index b85b7990..f201ea79 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt @@ -17,6 +17,7 @@ package im.vector.riotredesign.features.home import com.airbnb.mvrx.MvRxState +import im.vector.matrix.android.api.session.sync.SyncState data class HomeDetailViewState( val notificationCountCatchup: Int = 0, @@ -24,5 +25,6 @@ data class HomeDetailViewState( val notificationCountPeople: Int = 0, val notificationHighlightPeople: Boolean = false, val notificationCountRooms: Int = 0, - val notificationHighlightRooms: Boolean = false + val notificationHighlightRooms: Boolean = false, + val syncState: SyncState = SyncState.IDLE ) : MvRxState \ No newline at end of file diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml index a54fa61e..0c4519fd 100644 --- a/vector/src/main/res/layout/fragment_home_detail.xml +++ b/vector/src/main/res/layout/fragment_home_detail.xml @@ -44,13 +44,26 @@ + + + app:layout_constraintTop_toBottomOf="@+id/syncProgressBar" /> Date: Wed, 12 Jun 2019 10:53:48 +0200 Subject: [PATCH 2/3] Settings: add some webview content --- .../src/main/assets/open_source_licenses.html | 477 ++++++++++++++++++ .../vector/riotredesign/core/utils/Dialogs.kt | 37 ++ .../VectorSettingsPreferencesFragment.kt | 12 +- .../features/settings/VectorSettingsUrls.kt | 28 + 4 files changed, 546 insertions(+), 8 deletions(-) create mode 100755 vector/src/main/assets/open_source_licenses.html create mode 100644 vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt create mode 100644 vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html new file mode 100755 index 00000000..15d9252c --- /dev/null +++ b/vector/src/main/assets/open_source_licenses.html @@ -0,0 +1,477 @@ + + + + + +
+

Riot Android

+

Third Party Licenses

+
+ +
    +
  • + glide +
    + Copyright 2014 Google, Inc. All rights reserved. +
    • +
+
+License for everything not in third_party and not otherwise marked:
+
+Copyright 2014 Google, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+         conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+         of conditions and the following disclaimer in the documentation and/or other materials
+         provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY GOOGLE, INC. ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE, INC. OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those of the
+authors and should not be interpreted as representing official policies, either expressed
+or implied, of Google, Inc.
+---------------------------------------------------------------------------------------------
+License for third_party/disklrucache:
+
+Copyright 2012 Jake Wharton
+Copyright 2011 The Android Open Source Project
+
+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.
+---------------------------------------------------------------------------------------------
+License for third_party/gif_decoder:
+
+Copyright (c) 2013 Xcellent Creations, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---------------------------------------------------------------------------------------------
+License for third_party/gif_encoder/AnimatedGifEncoder.java and
+third_party/gif_encoder/LZWEncoder.java:
+
+No copyright asserted on the source code of this class. May be used for any
+purpose, however, refer to the Unisys LZW patent for restrictions on use of
+the associated LZWEncoder class. Please forward any corrections to
+kweiner@fmsware.com.
+
+-----------------------------------------------------------------------------
+License for third_party/gif_encoder/NeuQuant.java
+
+Copyright (c) 1994 Anthony Dekker
+
+NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. See
+"Kohonen neural networks for optimal colour quantization" in "Network:
+Computation in Neural Systems" Vol. 5 (1994) pp 351-367. for a discussion of
+the algorithm.
+
+Any party obtaining a copy of these files from the author, directly or
+indirectly, is granted, free of charge, a full and unrestricted irrevocable,
+world-wide, paid up, royalty-free, nonexclusive right and license to deal in
+this software and documentation files (the "Software"), including without
+limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons who
+receive copies from any such party to do so, with the only requirement being
+that this copyright notice remain intact.
+
+ +
    +
  • + Stetho +
    + Copyright (c) 2015, Facebook, Inc. All rights reserved. +
    • +
+
+BSD License
+
+For Stetho software
+
+Copyright (c) 2015, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+* Neither the name Facebook nor the names of its contributors may be used to
+endorse or promote products derived from this software without specific
+prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ + +

+ Apache License +
+ Version 2.0, January 2004 +

+
    +
  • + Matrix SDK +
    + Copyright (c) 2016 OpenMarket Ltd +
    + Copyright (c) 2016-2017 Vector Creations Ltd +
    + Copyright (c) 2018-2019 New Vector Ltd +
    + Copyright (c) 2019 The Matrix.org Foundation C.I.C +
    • +
  • + Jitsi Meet (jitsi-meet) +
    + Copyright @ 2018-present 8x8, Inc. +
    + Copyright @ 2017-2018 Atlassian Pty Ltd +
    • +
  • + Retrofit +
    + Copyright 2013 Square, Inc. +
    • +
  • + okhttp +
    + Copyright 2016 Square, Inc. +
    • +
  • + ShortcutBadger +
    + Copyright 2014 Leo Lin +
    • +
  • + html-textview +
    + Copyright (C) 2013-2015 Dominik Schürmann +
    + Copyright (C) 2013-2015 Juha Kuitunen +
    + Copyright (C) 2013 Mohammed Lakkadshaw +
    + Copyright (C) 2007 The Android Open Source Project +
    • +
  • + anddown +
    + Copyright (c) 2016 CommonsWare, LLC +
    • +
  • + zip4j +
    + Copyright 2010 Srikanth Reddy Lingala +
    • +
  • + SwipeBack +
    + Copyright 2015 Eric Liu +
    • +
  • + Libphonenumber +
    + Copyright 2017 Google +
    • +
  • + Butter Knife +
    + Copyright 2013 Jake Wharton +
    • +
  • + FloatingActionButton +
    + Copyright (C) 2014 Jerzy Chalupski +
    • +
  • + Spanny +
    + Copyright 2015 Pavlovsky Ivan +
    • +
  • + PhotoView +
    + Copyright 2018 Chris Banes +
    • +
  • + Epoxy +
    + Copyright 2016 Airbnb, Inc. +
    • +
  • + Anko +
    + Copyright 2016 JetBrains s.r.o. +
    • +
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+ + +
    +
  • + Tapadoo/Alerter +
    + Tapadoo/Alerter is licensed under the MIT License + Copyright 2017 Tapadoo, Dublin. +
    • +
+
+
+Copyright 2017 Tapadoo, Dublin.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+ + diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt new file mode 100644 index 00000000..6aa63660 --- /dev/null +++ b/vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt @@ -0,0 +1,37 @@ +/* + * + * * Copyright 2019 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. + * + */ + +package im.vector.riotredesign.core.utils + +import android.content.Context +import android.webkit.WebView +import androidx.appcompat.app.AlertDialog + +/** + * Open a web view above the current activity. + * + * @param url the url to open + */ +fun Context.displayInWebView(url: String) { + val wv = WebView(this) + wv.loadUrl(url) + AlertDialog.Builder(this) + .setView(wv) + .setPositiveButton(android.R.string.ok, null) + .show() +} \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt index c1c30658..10f553a3 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt @@ -632,32 +632,28 @@ class VectorSettingsPreferencesFragment : VectorPreferenceFragment(), SharedPref // copyright findPreference(PreferencesManager.SETTINGS_COPYRIGHT_PREFERENCE_KEY) .onPreferenceClickListener = Preference.OnPreferenceClickListener { - notImplemented() - // TODO VectorUtils.displayAppCopyright() + activity?.displayInWebView(VectorSettingsUrls.COPYRIGHT) false } // terms & conditions findPreference(PreferencesManager.SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY) .onPreferenceClickListener = Preference.OnPreferenceClickListener { - notImplemented() - // TODO VectorUtils.displayAppTac() + activity?.displayInWebView(VectorSettingsUrls.TAC) false } // privacy policy findPreference(PreferencesManager.SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY) .onPreferenceClickListener = Preference.OnPreferenceClickListener { - notImplemented() - // TODO VectorUtils.displayAppPrivacyPolicy() + activity?.displayInWebView(VectorSettingsUrls.PRIVACY_POLICY) false } // third party notice findPreference(PreferencesManager.SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY) .onPreferenceClickListener = Preference.OnPreferenceClickListener { - notImplemented() - // TODO VectorUtils.displayThirdPartyLicenses() + activity?.displayInWebView(VectorSettingsUrls.THIRD_PARTY_LICENSES) false } diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt new file mode 100644 index 00000000..7a3957e8 --- /dev/null +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt @@ -0,0 +1,28 @@ +/* + * + * * Copyright 2019 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. + * + */ + +package im.vector.riotredesign.features.settings + +object VectorSettingsUrls { + + const val COPYRIGHT = "https://riot.im/copyright" + const val TAC = "https://riot.im/tac" + const val PRIVACY_POLICY = "https://riot.im/privacy" + const val THIRD_PARTY_LICENSES = "file:///android_asset/open_source_licenses.html" + +} \ No newline at end of file From 0204bade8b090e7b7554e33270591b468ac64e13 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 12 Jun 2019 10:54:26 +0200 Subject: [PATCH 3/3] Content: hide some internal methods --- .../api/session/content/ContentUploadStateTracker.kt | 6 ------ .../android/internal/session/content/ContentModule.kt | 6 +++++- .../content/DefaultContentUploadStateTracker.kt | 6 +++--- .../internal/session/content/UploadContentWorker.kt | 11 +++-------- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt index a08060e6..9211371d 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/content/ContentUploadStateTracker.kt @@ -22,12 +22,6 @@ interface ContentUploadStateTracker { fun untrack(key: String, updateListener: UpdateListener) - fun setFailure(key: String) - - fun setSuccess(key: String) - - fun setProgress(key: String, current: Long, total: Long) - interface UpdateListener { fun onUpdate(state: State) } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentModule.kt index 67ff2d7b..7fb9b757 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentModule.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/ContentModule.kt @@ -27,7 +27,11 @@ internal class ContentModule { val definition = module(override = true) { scope(DefaultSession.SCOPE) { - DefaultContentUploadStateTracker() as ContentUploadStateTracker + DefaultContentUploadStateTracker() + } + + scope(DefaultSession.SCOPE) { + get() as ContentUploadStateTracker } scope(DefaultSession.SCOPE) { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt index 66bd5a82..a5dd16fb 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/DefaultContentUploadStateTracker.kt @@ -40,17 +40,17 @@ internal class DefaultContentUploadStateTracker : ContentUploadStateTracker { } } - override fun setFailure(key: String) { + internal fun setFailure(key: String) { val failure = ContentUploadStateTracker.State.Failure updateState(key, failure) } - override fun setSuccess(key: String) { + internal fun setSuccess(key: String) { val success = ContentUploadStateTracker.State.Success updateState(key, success) } - override fun setProgress(key: String, current: Long, total: Long) { + internal fun setProgress(key: String, current: Long, total: Long) { val progressData = ContentUploadStateTracker.State.ProgressData(current, total) updateState(key, progressData) } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt index 4eeb124d..0182eb6c 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/content/UploadContentWorker.kt @@ -21,15 +21,10 @@ import androidx.work.CoroutineWorker import androidx.work.WorkerParameters import com.squareup.moshi.JsonClass import im.vector.matrix.android.api.session.content.ContentAttachmentData -import im.vector.matrix.android.api.session.content.ContentUploadStateTracker import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.toContent import im.vector.matrix.android.api.session.events.model.toModel -import im.vector.matrix.android.api.session.room.model.message.MessageAudioContent -import im.vector.matrix.android.api.session.room.model.message.MessageContent -import im.vector.matrix.android.api.session.room.model.message.MessageFileContent -import im.vector.matrix.android.api.session.room.model.message.MessageImageContent -import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent +import im.vector.matrix.android.api.session.room.model.message.* import im.vector.matrix.android.internal.di.MatrixKoinComponent import im.vector.matrix.android.internal.network.ProgressRequestBody import im.vector.matrix.android.internal.session.room.send.SendEventWorker @@ -43,7 +38,7 @@ internal class UploadContentWorker(context: Context, params: WorkerParameters) : CoroutineWorker(context, params), MatrixKoinComponent { private val fileUploader by inject() - private val contentUploadProgressTracker by inject() + private val contentUploadProgressTracker by inject() @JsonClass(generateAdapter = true) internal data class Params( @@ -54,7 +49,7 @@ internal class UploadContentWorker(context: Context, params: WorkerParameters) override suspend fun doWork(): Result { val params = WorkerParamsFactory.fromData(inputData) - ?: return Result.failure() + ?: return Result.failure() val eventId = params.event.eventId ?: return Result.failure() val attachment = params.attachment