(feat) implement new jitsi meet v2 (android for now), restructure app navigation (2b5afc48) · Commits · Minds / Minds Mobile

App.js

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ sessionService.onLogin(async () => {
		}

		logService.info('[App] navigating to initial screen', sessionService.initialScreen);
		NavigationService.reset(sessionService.initialScreen);
		NavigationService.navigate(sessionService.initialScreen);

		// check update
		if (Platform.OS !== 'ios' && !GOOGLE_PLAY_STORE) {
		@@ -214,7 +214,7 @@ export default class App extends Component<Props, State> {

		if (!token) {
		logService.info('[App] there is no active session');
		NavigationService.reset('Login');
		NavigationService.navigate('Login');
		} else {
		logService.info('[App] session initialized');
		}

android/app/build.gradle

+13 −18

Original line number	Diff line number	Diff line
		@@ -184,11 +184,6 @@ android {
		// }
		}
		}

		// packagingOptions {
		// pickFirst '**/libjsc.so'
		// pickFirst '**/libc++_shared.so'
		// }
		}

		dependencies {
		@@ -206,21 +201,21 @@ dependencies {


		implementation project(':rn-apk')
		implementation project(':react-native-gesture-handler')
		compile project(':react-native-background-timer')
		implementation 'com.google.firebase:firebase-core:16.0.7'
		implementation 'com.google.firebase:firebase-messaging:17.3.3' // IMPORTANT: fix the crash when the app receives a push notification
		// implementation(project(':react-native-jitsi-meet')) {
		// // solve issues with the packages shared with the jitsi bundle
		// exclude group: 'com.facebook.react', module:'react-native-vector-icons'
		// exclude group: 'com.facebook.react',module:'react-native-fetch-blob'
		// exclude group: 'com.facebook.react',module:'react-native-keep-awake'
		// exclude group: 'com.facebook.react',module:'react-native-fast-image'
		// exclude group: 'com.facebook.react',module:'react-native-background-timer'
		// // exclude group: 'com.facebook.react',module:'react-native-google-signin'
		// exclude group: 'com.google.firebase'
		// }
		implementation project(':react-native-background-timer')

		// I manually linked this package to fix the build errors ignoring the following packages
		implementation(project(':react-native-jitsi-meet')) {
		exclude group: 'com.facebook.react', module:'react-native-community-async-storage'
		exclude group: 'com.facebook.react', module:'react-native-community_netinfo'
		exclude group: 'com.facebook.react', module:'react-native-webview'
		exclude group: 'com.facebook.react', module:'react-native-vector-icons'
		exclude group: 'com.facebook.react', module:'react-native-keep-awake'
		exclude group: 'com.facebook.react', module:'react-native-svg'
		exclude group: 'com.facebook.react', module:'react-native-gesture-handler'
		exclude group: 'com.google.firebase'
		}

		implementation project(':react-native-fs')
		implementation project(':react-native-share-menu')
		implementation project(':react-native-keep-awake')

android/app/src/main/AndroidManifest.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@
		</intent-filter>
		</activity>
		<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
		<activity android:name="com.reactnativejitsimeet.JitsiMeetNavigatorActivity" />
		<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_stat_name" />
		<provider
		android:name="androidx.core.content.FileProvider"

android/app/src/main/java/com/minds/mobile/MainApplication.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ import com.corbt.keepawake.KCKeepAwakePackage;
		import cl.json.ShareApplication;
		import com.meedan.ShareMenuPackage;
		import com.rnfs.RNFSPackage;
		import com.ocetnik.timer.BackgroundTimerPackage;
		import java.util.List;
		import javax.annotation.Nullable;
		import java.lang.reflect.InvocationTargetException;
		@@ -34,16 +33,6 @@ public class MainApplication extends Application implements ShareApplication, Re
		protected List<ReactPackage> getPackages() {
		@SuppressWarnings("UnnecessaryLocalVariable")
		List<ReactPackage> packages = new PackageList(this).getPackages();
		// Packages that cannot be autolinked yet can be added manually here, for example:
		// packages.add(new MyReactNativePackage());
		// packages.add(new BackgroundTimerPackage());
		// packages.add(new CryptoPackage());
		// packages.add(new RNFSPackage());
		// packages.add(new KCKeepAwakePackage()); //TOOD: update to new expo keep awake
		// packages.add(new ShareMenuPackage()); //TOOD: migrate to new https://github.com/ajith-ab/react-native-file-share-intent

		// packages.add(new RNNotificationsPackage()); //TOOD: update to new expo keep awake

		return packages;
		}

android/build.gradle

+1 −11

Original line number	Diff line number	Diff line
		@@ -28,9 +28,7 @@ allprojects {
		repositories {
		mavenLocal()
		maven {
		// url "$rootDir/../../jitsi-maven-repository/releases" // used for local dev of jitsi sdk
		// url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" // original
		url "https://gitlab.com/minds/jitsi-maven-repository/raw/master/releases" // ours custom sdk
		url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases"
		}
		maven {
		// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
		@@ -63,14 +61,6 @@ subprojects {
		}

		configurations.all {
		// afterEvaluate {p ->
		// if (p.hasProperty("android")) {
		// android {
		// compileSdkVersion rootProject.ext.compileSdkVersion
		// buildToolsVersion rootProject.ext.supportLibVersion
		// }
		// }
		// }
		resolutionStrategy.eachDependency { details ->
		if (details.requested.group == 'com.android.support'
		&& !details.requested.name.contains('multidex') ) {