Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2556164 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '721-Add_missing_flag_for_a12_build' into 'main' 

721-Add_missing_flag_for_a12_build

See merge request !68
parents f410222f 64fbfbe8

app/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ dependencies { 
    implementation 'com.google.android.flexbox:flexbox:3.0.0'

    implementation 'androidx.recyclerview:recyclerview:1.2.1'

    implementation 'com.google.android.material:material:1.6.1'

    implementation 'androidx.work:work-runtime-ktx:2.7.1'



    def room_version = '2.4.3'

    implementation "androidx.room:room-runtime:$room_version"

app/src/main/java/at/bitfire/davdroid/ui/setup/GoogleAuthenticatorFragment.kt

+7 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context 
import android.content.Intent

import android.net.ConnectivityManager

import android.os.AsyncTask

import android.os.Build

import android.os.Bundle

import android.os.Handler

import android.os.Looper
@@ -200,7 +201,12 @@ class GoogleAuthenticatorFragment : Fragment(), AuthorizationService.TokenRespon 
        intent.putExtra(LoginActivity.OPEN_APP_PACKAGE_AFTER_AUTH, requireActivity().intent.getStringExtra(LoginActivity.OPEN_APP_PACKAGE_AFTER_AUTH))

        intent.putExtra(LoginActivity.OPEN_APP_ACTIVITY_AFTER_AUTH, requireActivity().intent.getStringExtra(LoginActivity.OPEN_APP_ACTIVITY_AFTER_AUTH))



        return PendingIntent.getActivity(context, request.hashCode(), intent, 0)

        var flag = 0

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {

            flag = flag or PendingIntent.FLAG_MUTABLE

        }



        return PendingIntent.getActivity(context, request.hashCode(), intent, flag)

    }



    private fun exchangeAuthorizationCode(authorizationResponse: AuthorizationResponse) {