Skip to content

Commit

Permalink
Release 2.0.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
Worldline-Bambora-Checkout-support authored and jenkins committed Sep 14, 2023
1 parent 28121c8 commit e749661
Show file tree
Hide file tree
Showing 8 changed files with 131 additions and 134 deletions.
2 changes: 1 addition & 1 deletion BamboraSDK/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ android {
defaultConfig {
minSdk 26
targetSdk 33
buildConfigField "String", "VERSION_NAME", '"CheckoutSDKAndroid/2.0.0"'
buildConfigField "String", "VERSION_NAME", '"CheckoutSDKAndroid/2.0.1"'
}

buildTypes {
Expand Down
3 changes: 2 additions & 1 deletion BamboraSDK/src/test/java/CheckoutTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.bambora.android.java.checkoutsdk.EventType
import com.bambora.android.java.checkoutsdk.extensions.isPackageInstalled
import io.mockk.every
import io.mockk.mockkStatic
import java.util.UUID
import junit.framework.TestCase.assertEquals
import junit.framework.TestCase.assertFalse
import junit.framework.TestCase.assertTrue
Expand Down Expand Up @@ -63,7 +64,7 @@ internal class CheckoutTest {
private val mockBamboraCheckoutActivity = mock(BamboraCheckoutActivity::class.java)
private lateinit var defaultCheckout: Checkout
private val appScheme = "appScheme"
private val sessionToken = "369b2892a3c44a5699d557a37c4a78a6"
private val sessionToken = UUID.randomUUID().toString()
private val returnUrl = "appScheme://bamborasdk/return"
private val eventsToSubscribe = listOf(
EventType.AUTHORIZE,
Expand Down
3 changes: 2 additions & 1 deletion BamboraSDK/src/test/java/ConstructCheckoutUrlTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.bambora.android.java.checkoutsdk.BamboraCheckoutActivity
import com.bambora.android.java.checkoutsdk.extensions.isPackageInstalled
import io.mockk.every
import io.mockk.mockkStatic
import java.util.UUID
import junit.framework.TestCase.assertEquals
import org.junit.After
import org.junit.BeforeClass
Expand All @@ -49,7 +50,7 @@ internal class ConstructCheckoutUrlTest {
private val customBaseUrl = "https://base.url.com"
private val productionUrl = "https://v1.checkout.bambora.com"
private val appScheme = "bamborademoapp"
private val sessionToken = "369b2892a3c44a5699d557a37c4a78a6"
private val sessionToken = UUID.randomUUID().toString()

@After
fun closeSDK() {
Expand Down
16 changes: 4 additions & 12 deletions DemoApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@
android:theme="@style/Theme.BamboraCheckoutSDK"
tools:targetApi="31">
<activity
android:name=".ReturnActivity"
android:name=".MainActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />

Expand All @@ -48,17 +51,6 @@
android:scheme="bamborademoapp" />
</intent-filter>
</activity>
<activity
android:name=".MainActivity"
android:exported="true"
android:windowSoftInputMode="adjustResize"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import com.bambora.android.java.demoapp.databinding.ActivityMainBinding
/**
* The initial activity of the app.
*
* If it is redirected to from the [ReturnActivity], it will have a deeplink URL in its extras.
* If it is redirected to from a wallet app, it will have a deeplink URL in its intent data.
* If the deeplink URL is not null, it will process the deeplink based on whether the Checkout is initialized or not.
*/
class MainActivity : AppCompatActivity() {
Expand All @@ -44,15 +44,15 @@ class MainActivity : AppCompatActivity() {
setContentView(binding.root)
openSessionFragment()

val deeplink = intent?.extras?.getString("deeplink")
val deeplink = intent?.dataString
if (deeplink != null) {
bamboraSDKHelper.processDeeplink(deeplink)
}
}

override fun onNewIntent(intent: Intent?) {
super.onNewIntent(intent)
val deeplink = intent?.extras?.getString("deeplink")
val deeplink = intent?.dataString
if (deeplink != null) {
bamboraSDKHelper.processDeeplink(deeplink)
}
Expand Down

This file was deleted.

Loading

0 comments on commit e749661

Please sign in to comment.