jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4850 from vector-im/feature/bma/small_changes 

Small changes
This commit is contained in:
Benoit Marty 2022-01-04 15:24:39 +01:00 committed by GitHub
parent 5340d16e1f df957971a8
commit c836491498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
View File

@ -36,6 +36,7 @@ import org.matrix.android.sdk.internal.session.sync.model.accountdata.AcceptedTe
import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccountDataTask
import org.matrix.android.sdk.internal.session.user.accountdata.UserAccountDataDataSource
import org.matrix.android.sdk.internal.util.ensureTrailingSlash
import timber.log.Timber
import javax.inject.Inject
internal class DefaultTermsService @Inject constructor(
@ -63,19 +64,28 @@ internal class DefaultTermsService @Inject constructor(
*/
override suspend fun getHomeserverTerms(baseUrl: String): TermsResponse {
return try {
val request = baseUrl + NetworkConstants.URI_API_PREFIX_PATH_R0 + "register"
executeRequest(null) {
termsAPI.register(baseUrl + NetworkConstants.URI_API_PREFIX_PATH_R0 + "register")
termsAPI.register(request)
}
// Return empty result if it succeed, but it should never happen
Timber.w("Request $request succeeded, it should never happen")
TermsResponse()
} catch (throwable: Throwable) {
@Suppress("UNCHECKED_CAST")
TermsResponse(
policies = (throwable.toRegistrationFlowResponse()
?.params
?.get(LoginFlowTypes.TERMS) as? JsonDict)
?.get("policies") as? JsonDict
)
val registrationFlowResponse = throwable.toRegistrationFlowResponse()
if (registrationFlowResponse != null) {
@Suppress("UNCHECKED_CAST")
TermsResponse(
policies = (registrationFlowResponse
.params
?.get(LoginFlowTypes.TERMS) as? JsonDict)
?.get("policies") as? JsonDict
)
} else {
// Other error
Timber.e(throwable, "Error while getting homeserver terms")
throw throwable
}
}
}

8
vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
View File

@ -160,7 +160,7 @@ class WidgetFragment @Inject constructor() :
return@withState true
}
R.id.action_delete -> {
viewModel.handle(WidgetAction.DeleteWidget)
deleteWidget()
return@withState true
}
R.id.action_refresh -> if (state.formattedURL.complete) {
@ -172,7 +172,7 @@ class WidgetFragment @Inject constructor() :
return@withState true
}
R.id.action_revoke -> if (state.status == WidgetStatus.WIDGET_ALLOWED) {
viewModel.handle(WidgetAction.RevokeWidget)
revokeWidget()
return@withState true
}
}
@ -306,7 +306,7 @@ class WidgetFragment @Inject constructor() :
)
}
fun deleteWidget() {
private fun deleteWidget() {
MaterialAlertDialogBuilder(requireContext())
.setMessage(R.string.widget_delete_message_confirmation)
.setPositiveButton(R.string.remove) { _, _ ->
@ -316,7 +316,7 @@ class WidgetFragment @Inject constructor() :
.show()
}
fun revokeWidget() {
private fun revokeWidget() {
viewModel.handle(WidgetAction.RevokeWidget)
}
}