filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1701 from vector-im/feature/riotx_remaining 

RiotX -> Element
This commit is contained in:
Benoit Marty 2020-07-16 18:56:44 +02:00 committed by GitHub
parent 978ab76644 1d2e374526
commit 44fb53ce6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/signin.md
View File

@ -132,7 +132,7 @@ It's worth noting that the response from the homeserver contains the userId of A
### Login with Msisdn ### Login with Msisdn
Not supported yet in RiotX Not supported yet in Element
### Login with SSO ### Login with SSO
@ -155,9 +155,9 @@ Not supported yet in RiotX
In this case, the user can click on "Sign in with SSO" and the native web browser, or a ChromeCustomTab if the device supports it, will be launched on the page In this case, the user can click on "Sign in with SSO" and the native web browser, or a ChromeCustomTab if the device supports it, will be launched on the page
> https://homeserver.with.sso/_matrix/client/r0/login/sso/redirect?redirectUrl=riotx%3A%2F%2Friotx > https://homeserver.with.sso/_matrix/client/r0/login/sso/redirect?redirectUrl=element%3A%2F%element
The parameter `redirectUrl` is set to `riotx://riotx`. The parameter `redirectUrl` is set to `element://element`.
ChromeCustomTabs are an intermediate way to display a WebPage, between a WebView and using the external browser. More info can be found [here](https://developer.chrome.com/multidevice/android/customtabs) ChromeCustomTabs are an intermediate way to display a WebPage, between a WebView and using the external browser. More info can be found [here](https://developer.chrome.com/multidevice/android/customtabs)
@ -167,9 +167,9 @@ During the process, user may be asked to validate an email by clicking on a link
Once the process is finished, the web page will call the `redirectUrl` with an extra parameter `loginToken` Once the process is finished, the web page will call the `redirectUrl` with an extra parameter `loginToken`
> riotx://riotx?loginToken=MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy > element://element?loginToken=MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy
This navigation is intercepted by RiotX by the `LoginActivity`, which will then ask the homeserver to convert this `loginToken` to an access token This navigation is intercepted by Element by the `LoginActivity`, which will then ask the homeserver to convert this `loginToken` to an access token
> curl -X POST --data $'{"type":"m.login.token","token":"MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy"}' 'https://homeserver.with.sso/_matrix/client/r0/login' > curl -X POST --data $'{"type":"m.login.token","token":"MDAxOWxvY2F0aW9uIG1vemlsbGEub3JnCjAwMTNpZGVudGlmaWVy"}' 'https://homeserver.with.sso/_matrix/client/r0/login'

4
vector/src/main/AndroidManifest.xml
View File

@ -80,8 +80,8 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" /> <category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="riotx" /> <data android:scheme="element" />
<data android:host="riotx" /> <data android:host="element" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".features.media.ImageMediaViewerActivity" /> <activity android:name=".features.media.ImageMediaViewerActivity" />

2
vector/src/main/assets/open_source_licenses.html
View File

@ -28,7 +28,7 @@
</head> </head>
<body> <body>
<div> <div>
<p>RiotX Android</p> <p>Element Android</p>
<p>Third Party Licenses</p> <p>Third Party Licenses</p>
</div> </div>

2
vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt
View File

@ -36,7 +36,7 @@ class AppNameProvider @Inject constructor(private val context: Context) {
return appName return appName
} catch (e: Exception) { } catch (e: Exception) {
Timber.e(e, "## AppNameProvider() : failed") Timber.e(e, "## AppNameProvider() : failed")
return "RiotXAndroid" return "ElementAndroid"
} }
} }
} }

2
vector/src/main/java/im/vector/riotx/features/call/telecom/VectorConnectionService.kt
View File

@ -66,7 +66,7 @@ import im.vector.riotx.core.services.CallService
connection.connectionCapabilities = Connection.CAPABILITY_MUTE connection.connectionCapabilities = Connection.CAPABILITY_MUTE
connection.audioModeIsVoip = true connection.audioModeIsVoip = true
connection.setAddress(Uri.fromParts("tel", "+905000000000", null), TelecomManager.PRESENTATION_ALLOWED) connection.setAddress(Uri.fromParts("tel", "+905000000000", null), TelecomManager.PRESENTATION_ALLOWED)
connection.setCallerDisplayName("RiotX Caller", TelecomManager.PRESENTATION_ALLOWED) connection.setCallerDisplayName("Element Caller", TelecomManager.PRESENTATION_ALLOWED)
connection.statusHints = StatusHints("Testing Hint...", null, null) connection.statusHints = StatusHints("Testing Hint...", null, null)
bindService(Intent(applicationContext, CallService::class.java), CallServiceConnection(connection), 0) bindService(Intent(applicationContext, CallService::class.java), CallServiceConnection(connection), 0)

4
vector/src/main/java/im/vector/riotx/features/login/LoginViewState.kt
View File

@ -73,7 +73,7 @@ data class LoginViewState(
append(homeServerUrl?.trim { it == '/' }) append(homeServerUrl?.trim { it == '/' })
append(SSO_REDIRECT_PATH) append(SSO_REDIRECT_PATH)
// Set a redirect url we will intercept later // Set a redirect url we will intercept later
appendParamToUrl(SSO_REDIRECT_URL_PARAM, RIOTX_REDIRECT_URL) appendParamToUrl(SSO_REDIRECT_URL_PARAM, VECTOR_REDIRECT_URL)
deviceId?.takeIf { it.isNotBlank() }?.let { deviceId?.takeIf { it.isNotBlank() }?.let {
// But https://github.com/matrix-org/synapse/issues/5755 // But https://github.com/matrix-org/synapse/issues/5755
appendParamToUrl("device_id", it) appendParamToUrl("device_id", it)
@ -83,6 +83,6 @@ data class LoginViewState(
companion object { companion object {
// Note that the domain can be displayed to the user for confirmation that he trusts it. So use a human readable string // Note that the domain can be displayed to the user for confirmation that he trusts it. So use a human readable string
private const val RIOTX_REDIRECT_URL = "riotx://riotx" private const val VECTOR_REDIRECT_URL = "element://element"
} }
} }

2
vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt
View File

@ -65,7 +65,7 @@ class VectorUncaughtExceptionHandler @Inject constructor(private val bugReporter
putBoolean(PREFS_CRASH_KEY, true) putBoolean(PREFS_CRASH_KEY, true)
} }
val b = StringBuilder() val b = StringBuilder()
val appName = "RiotX" // TODO Matrix.getApplicationName() val appName = "Element" // TODO Matrix.getApplicationName()
b.append(appName + " Build : " + versionCodeProvider.getVersionCode() + "\n") b.append(appName + " Build : " + versionCodeProvider.getVersionCode() + "\n")
b.append("$appName Version : ${versionProvider.getVersion(longFormat = true, useBuildNumber = true)}\n") b.append("$appName Version : ${versionProvider.getVersion(longFormat = true, useBuildNumber = true)}\n")

2
vector/src/main/res/values/donottranslate.xml
View File

@ -10,6 +10,6 @@
<string name="password_hint" translatable="false">********</string> <string name="password_hint" translatable="false">********</string>
<!-- Temporary string --> <!-- Temporary string -->
<string name="not_implemented" translatable="false">Not implemented yet in RiotX</string> <string name="not_implemented" translatable="false">Not implemented yet in Element</string>
</resources> </resources>