Merge branch 'login_old_browser_fix' into 'master'
Replace spaces by %20 in Uri for OAuth prompt See merge request pixeldroid/PixelDroid!385
This commit is contained in:
commit
6e7b1a63d7
|
@ -18,7 +18,6 @@ import org.pixeldroid.app.utils.db.storeInstance
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import retrofit2.HttpException
|
import retrofit2.HttpException
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.lang.IllegalArgumentException
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Overview of the flow of the login process: (boxes are requests done in parallel,
|
Overview of the flow of the login process: (boxes are requests done in parallel,
|
||||||
|
@ -229,7 +228,7 @@ class LoginActivity : BaseActivity() {
|
||||||
"client_id" + "=" + client_id + "&" +
|
"client_id" + "=" + client_id + "&" +
|
||||||
"redirect_uri" + "=" + "$oauthScheme://$PACKAGE_ID" + "&" +
|
"redirect_uri" + "=" + "$oauthScheme://$PACKAGE_ID" + "&" +
|
||||||
"response_type=code" + "&" +
|
"response_type=code" + "&" +
|
||||||
"scope=$SCOPE"
|
"scope=${SCOPE.replace(" ", "%20")}"
|
||||||
|
|
||||||
if (!openUrl(url)) return failedRegistration(getString(R.string.browser_launch_failed))
|
if (!openUrl(url)) return failedRegistration(getString(R.string.browser_launch_failed))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue