Merge branch 'zulip:main' into main

Author: aritroCoder

LICENSE

@@ -1,23 +1,3 @@
-Copyright 2016-2018 Kandra Labs, Inc., and contributors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this software except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-The software includes some works released by third parties under other
-free and open source licenses. Those works are redistributed under the
-license terms under which the works were received. For more details,
-see the ``docs/THIRDPARTY`` file included with this distribution.
-
---------------------------------------------------------------------------------
 
                                  Apache License
                            Version 2.0, January 2004

README.md

@@ -85,7 +85,7 @@ Zulip Mobile supersedes two legacy Zulip apps,
 
 ## License
 
-Copyright (c) 2016-2018 Kandra Labs, Inc., and contributors, and 2016 Dropbox, Inc.
+Copyright (c) 2016-2022 Kandra Labs, Inc., and contributors, and 2016 Dropbox, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

android/app/build.gradle

@@ -194,14 +194,24 @@ repositories {
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
     implementation "androidx.core:core-ktx:1.7.0"
     implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation 'androidx.browser:browser:1.0.0'
+
     implementation "com.google.firebase:firebase-messaging:17.3.4"
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+
+    // ==== Test dependencies
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.4.0'
+    testImplementation 'com.google.truth:truth:0.43'
+    testImplementation 'com.google.truth.extensions:truth-java8-extension:0.43'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+
+    // ==== RN-related dependencies
+
+    implementation 'com.facebook.fresco:animated-gif:2.0.0' // For animated GIF support
 
     // Workaround for facebook/react-native#32735; see
     //   https://github.com/facebook/react-native/issues/32735#issue-1077061487
@@ -212,6 +222,15 @@ dependencies {
         }
     }
 
+    // ----------------------------------------
+    // Dependencies from RN upstream, in the template app
+
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
         exclude group: 'com.facebook.fbjni'
     }
@@ -232,15 +251,10 @@ dependencies {
     } else {
         implementation jscFlavor
     }
+    // END dependencies from RN upstream
+    // ----------------------------------------
 
-    implementation 'com.facebook.fresco:animated-gif:2.0.0' // For animated GIF support
-    implementation 'androidx.browser:browser:1.0.0'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.4.0'
-    testImplementation 'com.google.truth:truth:0.43'
-    testImplementation 'com.google.truth.extensions:truth-java8-extension:0.43'
-    testImplementation 'org.mockito:mockito-core:1.10.19'
+    // Don't put new dependencies down here.  Put them above, before the upstream section.
 }
 
 // The default kotlinOptions.jvmTarget is 1.6.  With the default, we get

package.json

@@ -1,6 +1,7 @@
 {
   "name": "ZulipMobile",
   "version": "1.0.0",
+  "license": "Apache-2.0",
   "private": true,
   "scripts": {
     "postinstall": "bash tools/postinstall",

src/account/accountActions.js

@@ -1,12 +1,6 @@
 /* @flow strict-local */
 import * as NavigationService from '../nav/NavigationService';
-import type {
-  Dispatch,
-  PerAccountAction,
-  AllAccountsAction,
-  ThunkAction,
-  GlobalThunkAction,
-} from '../types';
+import type { PerAccountAction, AllAccountsAction, ThunkAction, GlobalThunkAction } from '../types';
 import {
   ACCOUNT_SWITCH,
   ACCOUNT_REMOVE,
@@ -34,30 +28,13 @@ const accountSwitchPlain = (index: number): AllAccountsAction => ({
 
 export const accountSwitch =
   (index: number): GlobalThunkAction<Promise<void>> =>
-  async (dispatch, getState) => {
+  async (dispatch, getState, { activeAccountDispatch }) => {
     NavigationService.dispatch(resetToMainTabs());
     dispatch(accountSwitchPlain(index));
 
-    /* $FlowFixMe[incompatible-type]
-
-     This is really a GlobalDispatch, because we're in a GlobalThunkAction.
-     (It's global because it needs to know about all the accounts to set the
-     pointer to the active one). But here, we pretend it's a Dispatch.
-     That's OK, for now, because:
-
-     - Our Dispatch function is secretly the same value as our
-       GlobalDispatch.
-     - The PerAccountState that Dispatch currently acts on is the one
-       belonging to the active account.
-     - We want this dispatch to act on the active account -- the new,
-       post-switch active account.
-     - It will act on that account, because at this point we've already
-       dispatched `accountSwitchPlain`.
-
-     TODO(#5006): perhaps have an `activeAccountDispatch: Dispatch` in
-       a new GlobalThunkExtras, modeled on ThunkExtras?
-  */
-    const activeAccountDispatch: Dispatch = dispatch;
+    // Now dispatch some actions on the new, post-switch active account.
+    // Because we just dispatched `accountSwitchPlain`, that new account
+    // is now the active account, so `activeAccountDispatch` will act on it.
 
     await activeAccountDispatch(registerAndStartPolling());
 

src/boot/store.js

@@ -20,6 +20,7 @@ import CompressedAsyncStorage from '../storage/CompressedAsyncStorage';
 import createMigration from '../redux-persist-migrate/index';
 import { getGlobalSession, getGlobalSettings } from '../directSelectors';
 import { migrations } from '../storage/migrations';
+import type { Dispatch, GlobalThunkExtras } from '../reduxTypes';
 
 if (process.env.NODE_ENV === 'development') {
   // Chrome dev tools for Immutable.
@@ -72,14 +73,35 @@ export const cacheKeys: $ReadOnlyArray<$Keys<GlobalState>> = [
   'realm', 'streams', 'subscriptions', 'unread', 'userGroups', 'users',
 ];
 
-const thunkExtras: ThunkExtras = {
-  // eslint-disable-next-line no-use-before-define
-  getGlobalSession: () => getGlobalSession(store.getState()),
+/* eslint-disable no-use-before-define */
 
-  // eslint-disable-next-line no-use-before-define
+const thunkExtras: $Exact<ThunkExtras> = {
+  getGlobalSession: () => getGlobalSession(store.getState()),
   getGlobalSettings: () => getGlobalSettings(store.getState()),
 };
 
+const globalThunkExtras: $Exact<GlobalThunkExtras> = {
+  // $FlowFixMe[escaped-generic]
+  // $FlowFixMe[incompatible-type]
+  /* $FlowFixMe[incompatible-cast]
+     The `store` type isn't complete: in particular it ignores thunk actions.
+
+     We're also using here the fact that the one function `store.dispatch`
+     secretly plays both the role of our `GlobalDispatch` type and our
+     `Dispatch` type... and that in the latter role, the PerAccountState
+     that it acts on is the one belonging to the active account.
+
+     TODO(#5006): We'll have to add more logic here when per-account and
+       global state become distinct.
+   */
+  activeAccountDispatch: action => (store.dispatch: Dispatch)(action),
+};
+
+const combinedThunkExtras: ThunkExtras & GlobalThunkExtras = {
+  ...thunkExtras,
+  ...globalThunkExtras,
+};
+
 /**
  * Return a list of Redux middleware objects to use in our Redux store.
  *
@@ -97,7 +119,7 @@ function listMiddleware() {
     // Handle the fancy "thunk" actions we often use, i.e. async
     // functions of `dispatch` and `state`.  See docs:
     //   https://github.com/reduxjs/redux-thunk
-    thunkMiddleware.withExtraArgument(thunkExtras),
+    thunkMiddleware.withExtraArgument(combinedThunkExtras),
   ];
 
   if (config.enableReduxLogging) {

src/notification/notifOpen.js

@@ -195,7 +195,7 @@ const readInitialNotification = async (): Promise<Notification | null> => {
 
 export const narrowToNotification =
   (data: ?Notification): GlobalThunkAction<void> =>
-  (dispatch, getState) => {
+  (dispatch, getState, { activeAccountDispatch }) => {
     if (!data) {
       return;
     }
@@ -228,15 +228,7 @@ export const narrowToNotification =
       getOwnUserId(state),
     );
     if (narrow) {
-      // We have a GlobalDispatch, because this is a global thunk action --
-      // at the top of the function, we didn't yet know which account was
-      // intended and had to work that out.  But now we know we're working on
-      // the active account, and want to dispatch a per-account action there.
-      // For the present, we just use the fact that our GlobalDispatch value
-      // is the same function as we use for Dispatch.
-      // TODO(#5006): perhaps have an `activeAccountDispatch: Dispatch` in a
-      //   new GlobalThunkExtras, modeled on ThunkExtras?
-      (dispatch: $FlowFixMe)(doNarrow(narrow));
+      activeAccountDispatch(doNarrow(narrow));
     }
   };
 

src/reduxTypes.js

@@ -636,21 +636,27 @@ export interface Dispatch {
 /** A per-account thunk action returning T. */
 export type ThunkAction<T> = (Dispatch, () => PerAccountState, ThunkExtras) => T;
 
+/** The extras object passed to a global thunk action. */
+export type GlobalThunkExtras = $ReadOnly<{
+  /** A per-account `dispatch` that acts on the active account. */
+  activeAccountDispatch: Dispatch,
+  ...
+}>;
+
 /** The Redux `dispatch` for a global context. */
 export interface GlobalDispatch {
   <A: DispatchableWithoutAccountAction>(action: A): A;
   <T>(GlobalThunkAction<T>): T;
 }
 
 /** A global thunk action returning T. */
-// This might take some extras later (e.g., to do something per-account on a
-// specific account), but for now it needs none.
-export type GlobalThunkAction<T> = (GlobalDispatch, () => GlobalState) => T;
+export type GlobalThunkAction<T> = (GlobalDispatch, () => GlobalState, GlobalThunkExtras) => T;
 
 // The two pairs of dispatch/thunk-action types aren't interchangeable,
 // in either direction.
 //   $FlowExpectedError[incompatible-return]
 (d: GlobalDispatch): Dispatch => d;
+//   $FlowExpectedError[prop-missing]
 //   $FlowExpectedError[incompatible-return]
 <T>(a: ThunkAction<T>): GlobalThunkAction<T> => a;
 //   $FlowExpectedError[incompatible-return]