@@ -19,7 +19,6 @@ package org.quantumbadger.redreader.fragments
19
19
20
20
import android.content.Intent
21
21
import android.graphics.BitmapFactory
22
- import android.net.Uri
23
22
import android.util.Log
24
23
import android.view.View
25
24
import android.widget.FrameLayout
@@ -28,6 +27,7 @@ import android.widget.ScrollView
28
27
import android.widget.Toast
29
28
import androidx.appcompat.app.AppCompatActivity
30
29
import androidx.appcompat.widget.AppCompatImageView
30
+ import androidx.core.net.toUri
31
31
import com.google.android.material.card.MaterialCardView
32
32
import com.google.android.material.chip.Chip
33
33
import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -55,6 +55,7 @@ import org.quantumbadger.redreader.common.time.TimestampUTC.Companion.now
55
55
import org.quantumbadger.redreader.reddit.APIResponseHandler.ActionResponseHandler
56
56
import org.quantumbadger.redreader.reddit.APIResponseHandler.UserResponseHandler
57
57
import org.quantumbadger.redreader.reddit.RedditAPI
58
+ import org.quantumbadger.redreader.reddit.api.RedditOAuth.completeLogin
58
59
import org.quantumbadger.redreader.reddit.api.RedditSubredditSubscriptionManager
59
60
import org.quantumbadger.redreader.reddit.api.SubredditSubscriptionState
60
61
import org.quantumbadger.redreader.reddit.things.InvalidSubredditNameException
@@ -502,8 +503,10 @@ object UserProfileDialog {
502
503
) { resultCode: Int , data: Intent ? ->
503
504
if (data != null ) {
504
505
if (resultCode == 123 && data.hasExtra(" url" )) {
505
- val uri = Uri .parse(data.getStringExtra(" url" ))
506
- completeLogin(activity, uri, RunnableOnce .DO_NOTHING )
506
+ val uri = data.getStringExtra(" url" )?.toUri()
507
+ if (uri != null ) {
508
+ completeLogin(activity, uri, RunnableOnce .DO_NOTHING )
509
+ }
507
510
}
508
511
}
509
512
}
0 commit comments