Skip to content

[PR-22929] Update Facebook SDK and dependencies #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2024
Merged

[PR-22929] Update Facebook SDK and dependencies #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.3'
classpath 'de.mobilej.unmock:UnMockPlugin:0.6.4'
classpath 'com.android.tools.build:gradle:3.6.4'
classpath 'com.github.bjoernq:unmockplugin:0.7.6'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -17,7 +17,7 @@ buildscript {

allprojects {
repositories {
jcenter()
mavenCentral()
google()
maven { url 'https://jitpack.io' }
}
Expand Down
20 changes: 10 additions & 10 deletions sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ apply plugin: 'com.github.dcendents.android-maven'
group='com.github.talkable'

android {
compileSdkVersion 31
compileSdkVersion 33

defaultConfig {
minSdkVersion 16
targetSdkVersion 31
versionCode 41
versionName "0.5.12"
targetSdkVersion 33
versionCode 42
versionName "0.5.13"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
Expand All @@ -37,7 +37,7 @@ repositories {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'

testImplementation 'org.mockito:mockito-core:1.10.19'
testImplementation('org.powermock:powermock-api-mockito:1.6.6') {
Expand All @@ -49,14 +49,14 @@ dependencies {
exclude module: 'objenesis'
}

androidTestImplementation 'androidx.annotation:annotation:1.0.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test:rules:1.1.1'
androidTestImplementation 'androidx.annotation:annotation:1.8.2'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test:rules:1.6.1'

implementation 'androidx.annotation:annotation:1.0.0'
implementation 'androidx.annotation:annotation:1.8.2'
implementation 'com.squareup.okhttp3:okhttp:3.2.0' // update to a new version when https://github.com/square/okhttp/issues/3928 will be fixed
implementation 'com.squareup.okhttp3:logging-interceptor:3.2.0'
implementation 'com.facebook.android:facebook-android-sdk:14.1.1'
implementation 'com.facebook.android:facebook-android-sdk:15.2.0'
implementation 'com.google.code.gson:gson:2.8.+'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
}
3 changes: 2 additions & 1 deletion sdk/src/main/java/com/talkable/sdk/utils/NativeFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.telephony.TelephonyManager;

import com.facebook.FacebookSdk;
import com.facebook.internal.FacebookSignatureValidator;
import com.facebook.messenger.MessengerUtils;
import com.google.gson.JsonObject;
import com.talkable.sdk.BuildConfig;
Expand Down Expand Up @@ -54,7 +55,7 @@ public static void initialize(Context context) {
isSmsAvailable = true;
}

isMessengerInstalled = MessengerUtils.hasMessengerInstalled(context);
isMessengerInstalled = FacebookSignatureValidator.validateSignature(context, MessengerUtils.PACKAGE_NAME);
isWhatsAppAvailable = isPackageInstalled("com.whatsapp", context);

Intent sendNativeMailIntent = new Intent(Intent.ACTION_SENDTO);
Expand Down