diff --git a/android/README.md b/android/README.md index 8a773e73a..d3c739f68 100644 --- a/android/README.md +++ b/android/README.md @@ -207,24 +207,6 @@ public class MainActivity extends FragmentActivity implements JitsiMeetActivityI -Starting with SDK version 1.22, a Glide module must be provided by the host app. -This makes it possible to use the Glide image processing library from both the -SDK and the host app itself. - -You can use the code in `JitsiGlideModule.java` and adjust the package name. -When building, add the following code in your `app/build.gradle` file, adjusting -the Glide version to match the one in https://github.com/jitsi/jitsi-meet/blob/master/android/build.gradle - -``` -// Glide -implementation("com.github.bumptech.glide:glide:${glideVersion}") { - exclude group: "com.android.support", module: "glide" -} -implementation("com.github.bumptech.glide:annotations:${glideVersion}") { - exclude group: "com.android.support", module: "annotations" -} -``` - ### JitsiMeetActivity This class encapsulates a high level API in the form of an Android `FragmentActivity` diff --git a/android/app/.project b/android/app/.project new file mode 100644 index 000000000..ac485d7c3 --- /dev/null +++ b/android/app/.project @@ -0,0 +1,23 @@ + + + app + Project app created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/app/build.gradle b/android/app/build.gradle index 4b1dccf29..6f5393934 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -88,15 +88,6 @@ dependencies { debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.1' releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.1' - - // Glide - implementation("com.github.bumptech.glide:glide:${rootProject.ext.glideVersion}") { - exclude group: "com.android.support", module: "glide" - } - implementation("com.github.bumptech.glide:annotations:${rootProject.ext.glideVersion}") { - exclude group: "com.android.support", module: "annotations" - } - annotationProcessor "com.github.bumptech.glide:compiler:${rootProject.ext.glideVersion}" } gradle.projectsEvaluated { diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 2dfeaa5fc..fcbfce39b 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -62,17 +62,6 @@ -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement -dontwarn okio.** -# FastImage + Glide - --keep public class com.dylanvann.fastimage.* {*;} --keep public class com.dylanvann.fastimage.** {*;} --keep public class * implements com.bumptech.glide.module.GlideModule --keep public class * extends com.bumptech.glide.module.AppGlideModule --keep public enum com.bumptech.glide.load.ImageHeaderParser$** { - **[] $VALUES; - public *; -} - # WebRTC -keep class org.webrtc.** { *; } diff --git a/android/app/src/main/java/org/jitsi/meet/JitsiGlideModule.java b/android/app/src/main/java/org/jitsi/meet/JitsiGlideModule.java deleted file mode 100644 index ee1e5470d..000000000 --- a/android/app/src/main/java/org/jitsi/meet/JitsiGlideModule.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.jitsi.meet; - -import com.bumptech.glide.annotation.GlideModule; -import com.bumptech.glide.module.AppGlideModule; - -/** - * An AppGlideModule needs to be present for image loading events to work in - * react-native-fast-image. However, if this is defined by the SDK it will cause trouble with - * apps which are using Glide themselves. - * - * In order to avoid the problem, define a Jitsi Glide module here, so applications already using - * it are not in trouble. - */ -@GlideModule -public final class JitsiGlideModule extends AppGlideModule { -} diff --git a/android/build.gradle b/android/build.gradle index 2f0483641..24ecb598d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -164,10 +164,6 @@ ext { mavenUser = System.env.MVN_USER ?: "" mavenPassword = System.env.MVN_PASSWORD ?: "" - // Glide - excludeAppGlideModule = true - glideVersion = "4.7.1" // keep in sync with react-native-fast-image - // Libre build libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean() } diff --git a/android/sdk/.project b/android/sdk/.project new file mode 100644 index 000000000..4736e19d1 --- /dev/null +++ b/android/sdk/.project @@ -0,0 +1,23 @@ + + + sdk + Project sdk created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index 8d123f1ec..148a3f301 100644 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -54,9 +54,6 @@ dependencies { implementation project(':react-native-background-timer') implementation project(':react-native-calendar-events') implementation project(':react-native-community-async-storage') - implementation(project(':react-native-fast-image')) { - exclude group: 'com.android.support' - } implementation project(':react-native-immersive') implementation project(':react-native-keep-awake') implementation project(':react-native-linear-gradient') diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java index c64f49552..736085d71 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java @@ -155,7 +155,6 @@ class ReactInstanceManagerHolder { new com.BV.LinearGradient.LinearGradientPackage(), new com.calendarevents.CalendarEventsPackage(), new com.corbt.keepawake.KCKeepAwakePackage(), - new com.dylanvann.fastimage.FastImageViewPackage(), new com.facebook.react.shell.MainReactPackage(), new com.oblador.vectoricons.VectorIconsPackage(), new com.ocetnik.timer.BackgroundTimerPackage(), diff --git a/android/settings.gradle b/android/settings.gradle index af203321d..e123e0fb6 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -7,8 +7,6 @@ include ':react-native-calendar-events' project(':react-native-calendar-events').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-calendar-events/android') include ':react-native-community-async-storage' project(':react-native-community-async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android') -include ':react-native-fast-image' -project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android') include ':react-native-google-signin' project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-signin/android') include ':react-native-immersive' diff --git a/ios/Podfile b/ios/Podfile index c9df18e99..25d443995 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -39,7 +39,6 @@ target 'JitsiMeet' do pod 'react-native-background-timer', :path => '../node_modules/react-native-background-timer' pod 'react-native-calendar-events', :path => '../node_modules/react-native-calendar-events' - pod 'react-native-fast-image', :path => '../node_modules/react-native-fast-image' pod 'react-native-keep-awake', :path => '../node_modules/react-native-keep-awake' pod 'react-native-webview', :path => '../node_modules/react-native-webview' pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc' diff --git a/package-lock.json b/package-lock.json index b4f3523f1..de455fc2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12309,11 +12309,6 @@ "jssha": "^2.2.0" } }, - "react-native-fast-image": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/react-native-fast-image/-/react-native-fast-image-5.1.1.tgz", - "integrity": "sha512-kEzgZxbbXYhy27u5GnhrKitn+XDBFAHSDUJdYC6llMi5cDPjgcqhOAQABj0K+ga5pn+/xPZLmD882rrUGiwVVA==" - }, "react-native-google-signin": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-native-google-signin/-/react-native-google-signin-2.0.0.tgz", @@ -16954,6 +16949,11 @@ "string-width": "^1.0.2 || 2" } }, + "windows-iana": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/windows-iana/-/windows-iana-3.1.0.tgz", + "integrity": "sha512-rCPf3AakAAgvapnbYVvG2bQyI3g6EDbPpjDJ72fdAu+XTzB1qvX4ZC6OnZ0I2+thaspjTb+8KwdyhdBl8Lt/QA==" + }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", diff --git a/package.json b/package.json index 697aefd64..856cf7d8a 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "react-native-background-timer": "2.1.1", "react-native-calendar-events": "1.6.4", "react-native-callstats": "3.58.2", - "react-native-fast-image": "5.1.1", "react-native-google-signin": "2.0.0", "react-native-immersive": "2.0.0", "react-native-keep-awake": "4.0.0",