Merge branch 'master' into fix/sync-quick-notes

Signed-off-by: Ammar Ahmed <40239442+ammarahm-ed@users.noreply.github.com>
2026-02-24 04:00:59 +01:00 · 2023-04-26 15:13:27 +05:00
parent 91138f4911 f9bcfe2f7a
commit 2febd09613
16 changed files with 65 additions and 47 deletions
--- a/apps/mobile/app/components/auth/session-expired.js
+++ b/apps/mobile/app/components/auth/session-expired.js
@@ -44,8 +44,10 @@ import Paragraph from "../ui/typography/paragraph";
 import { LoginSteps, useLogin } from "./use-login";

 function getObfuscatedEmail(email) {
-  if (!email) return null;
-  return email.replace(/(.{2})(.*)(?=@)/, function (gp1, gp2, gp3) {
+  if (!email) return "";
+  const [username, provider] = email.split("@");
+  if (username.length === 1) return `****@${provider}`;
+  return email.replace(/(.{1})(.*)(?=@)/, function (gp1, gp2, gp3) {
    for (let i = 0; i < gp3.length; i++) {
      gp2 += "*";
    }
--- a/apps/mobile/app/components/launcher/index.js
+++ b/apps/mobile/app/components/launcher/index.js
@@ -37,6 +37,7 @@ import { useNoteStore } from "../../stores/use-notes-store";
 import { useSettingStore } from "../../stores/use-setting-store";
 import { useThemeStore } from "../../stores/use-theme-store";
 import { useUserStore } from "../../stores/use-user-store";
+import { AndroidModule } from "../../utils";
 import { eOpenAnnouncementDialog } from "../../utils/events";
 import { getGithubVersion } from "../../utils/github-version";
 import { SIZE } from "../../utils/size";
@@ -192,6 +193,11 @@ const Launcher = React.memo(

    const onUnlockBiometrics = useCallback(async () => {
      if (!(await BiometricService.isBiometryAvailable())) return;
+      if (Platform.OS === "android") {
+        const activityName = await AndroidModule.getActivityName();
+        if (activityName !== "MainActivity") return;
+      }
+
      let verified = await BiometricService.validateUser(
        "Unlock to access your notes",
        ""
--- a/apps/mobile/app/components/properties/items.js
+++ b/apps/mobile/app/components/properties/items.js
@@ -116,11 +116,11 @@ export const Items = ({ item, buttons, close }) => {
        key={item.id}
        testID={"icon-" + item.id}
        customStyle={{
-          alignItems: "center",
+          alignSelf: "flex-start",
          width: topBarItemWidth,
-          marginBottom: 10,
          marginRight: isLast ? 0 : 10,
-          backgroundColor: "transparent"
+          backgroundColor: "transparent",
+          paddingHorizontal: 0
        }}
      >
        <PressableButton
@@ -150,11 +150,7 @@ export const Items = ({ item, buttons, close }) => {
          />
        </PressableButton>

-        <Paragraph
-          size={SIZE.xxs + 1}
-          style={{ textAlign: "center" }}
-          textBreakStrategy="simple"
-        >
+        <Paragraph size={SIZE.xxs + 1} style={{ textAlign: "center" }}>
          {item.title}
        </Paragraph>
      </PressableButton>
--- a/apps/mobile/app/components/sheets/sort/index.js
+++ b/apps/mobile/app/components/sheets/sort/index.js
@@ -25,7 +25,6 @@ import Navigation from "../../../services/navigation";
 import { useThemeStore } from "../../../stores/use-theme-store";
 import { GROUP, SORT } from "../../../utils/constants";
 import { refreshNotesPage } from "../../../utils/events";
-import layoutmanager from "../../../utils/layout-manager";
 import { SIZE } from "../../../utils/size";
 import { Button } from "../../ui/button";
 import Seperator from "../../ui/seperator";
@@ -39,7 +38,6 @@ const Sort = ({ type, screen }) => {
  const updateGroupOptions = async (_groupOptions) => {
    await db.settings.setGroupOptions(type, _groupOptions);

-    layoutmanager.withSpringAnimation(600);
    setGroupOptions(_groupOptions);
    setTimeout(() => {
      if (screen !== "TopicSheet") Navigation.queueRoutesForUpdate(screen);
--- a/apps/mobile/app/hooks/use-actions.js
+++ b/apps/mobile/app/hooks/use-actions.js
@@ -613,7 +613,7 @@ export const useActions = ({ close = () => null, item }) => {
    },
    {
      id: "pin",
-      title: item.pinned ? "Unpin" : "Pin",
+      title: "Pin",
      icon: item.pinned ? "pin-off-outline" : "pin-outline",
      func: pinItem,
      close: false,
@@ -623,7 +623,7 @@ export const useActions = ({ close = () => null, item }) => {
    },
    {
      id: "favorite",
-      title: !item.favorite ? "Favorite" : "Unfavorite",
+      title: "Favorite",
      icon: item.favorite ? "star-off" : "star-outline",
      func: addToFavorites,
      close: false,
--- a/apps/mobile/app/hooks/use-app-events.js
+++ b/apps/mobile/app/hooks/use-app-events.js
@@ -571,8 +571,8 @@ export const useAppEvents = () => {
      if (notesAddedFromIntent || shareExtensionOpened) {
        let id = useEditorStore.getState().currentEditingNote;
        let note = id && db.notes.note(id).data;
-        eSendEvent("loadingNote", note);
        eSendEvent("webview_reset");
+        setTimeout(() => eSendEvent("loadingNote", note), 1);
        MMKV.removeItem("shareExtensionOpened");
      }
    } catch (e) {
--- a/apps/mobile/app/screens/editor/tiptap/use-editor.ts
+++ b/apps/mobile/app/screens/editor/tiptap/use-editor.ts
@@ -580,22 +580,21 @@ export const useEditor = (

  const onReady = useCallback(async () => {
    if (!(await isEditorLoaded(editorRef, sessionIdRef.current))) {
-      overlay(true);
-      setLoading(true);
+      eSendEvent("webview_reset");
    } else {
      isDefaultEditor && restoreEditorState();
    }
-  }, [overlay, isDefaultEditor, restoreEditorState]);
+  }, [isDefaultEditor, restoreEditorState]);

  useEffect(() => {
    state.current.saveCount = 0;
-    async () => {
+    (async () => {
      await commands.setSessionId(sessionIdRef.current);
      if (sessionIdRef.current) {
        if (!state.current?.ready) return;
        await onReady();
      }
-    };
+    })();
  }, [sessionId, loading, commands, onReady]);

  const onLoad = useCallback(async () => {
@@ -636,6 +635,7 @@ export const useEditor = (
    saveContent,
    onContentChanged,
    editorId: editorId,
-    markImageLoaded
+    markImageLoaded,
+    overlay
  };
 };
--- a/apps/mobile/app/screens/editor/wrapper.js
+++ b/apps/mobile/app/screens/editor/wrapper.js
@@ -51,6 +51,7 @@ export const EditorWrapper = ({ width }) => {
    if (editorState().movedAway) return;
    if (state === "active") {
      editorController.current.onReady();
+      editorController.current.overlay(false);
    }
  };

--- a/apps/mobile/app/screens/settings/editor/tool-sheet.tsx
+++ b/apps/mobile/app/screens/settings/editor/tool-sheet.tsx
@@ -20,8 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { ToolId } from "@notesnook/editor/dist/toolbar";
 import React, { RefObject } from "react";
 import { View } from "react-native";
-import ActionSheet from "react-native-actions-sheet";
-import { ScrollView } from "react-native-gesture-handler";
 import { PressableButton } from "../../../components/ui/pressable";
 import { SvgView } from "../../../components/ui/svg";
 import Paragraph from "../../../components/ui/typography/paragraph";
@@ -34,13 +32,14 @@ import {
  getToolIcon,
  getUngroupedTools
 } from "./toolbar-definition";
+import { ActionSheetRef, ScrollView } from "react-native-actions-sheet";

 export default function ToolSheet({
  group,
  fwdRef
 }: {
  group: DraggableItem;
-  fwdRef: RefObject<ActionSheet>;
+  fwdRef: RefObject<ActionSheetRef>;
 }) {
  const colors = useThemeStore((state) => state.colors);
  const data = useDragState((state) => state.data);
@@ -50,6 +49,7 @@ export default function ToolSheet({
    (item: ToolId) => {
      const tool = findToolById(item);
      const iconSvgString = tool ? getToolIcon(tool.icon as ToolId) : null;
+      if (item === "none") return;
      return (
        <PressableButton
          key={item}
@@ -109,12 +109,7 @@ export default function ToolSheet({
        padding: 12
      }}
    >
-      <ScrollView
-        onMomentumScrollEnd={() => {
-          fwdRef.current?.handleChildScrollEnd();
-        }}
-        nestedScrollEnabled={true}
-      >
+      <ScrollView nestedScrollEnabled={true}>
        {!ungrouped || ungrouped.length === 0 ? (
          <Paragraph
            style={{
--- a/apps/mobile/app/services/notifications.ts
+++ b/apps/mobile/app/services/notifications.ts
@@ -86,8 +86,9 @@ async function getNextMonthlyReminderDate(
 }

 async function initDatabase(notes = true) {
-  if (db.isInitialized) return;
-  await db.initCollections();
+  if (!db.isInitialized) {
+    await db.initCollections();
+  }
  if (notes) {
    await db.notes?.init();
  }
--- a/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java
+++ b/apps/mobile/native/android/app/src/main/java/com/streetwriters/notesnook/RCTNNativeModule.java
@@ -4,6 +4,7 @@ package com.streetwriters.notesnook;
 import android.graphics.Color;
 import android.view.WindowManager;

+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -36,6 +37,16 @@ public class RCTNNativeModule extends ReactContextBaseJavaModule {
        }
    }

+    @ReactMethod
+    public void getActivityName(Promise promise) {
+        try {
+            promise.resolve(getCurrentActivity().getClass().getSimpleName());
+        } catch (Exception e) {
+            promise.resolve(null);
+        }
+    }
+
+

    @ReactMethod
    public void setSecureMode(final boolean mode) {
--- a/apps/web/src/components/field/index.js
+++ b/apps/web/src/components/field/index.js
@@ -92,6 +92,7 @@ function Field(props) {
        sx={{
          fontSize: "subtitle",
          fontWeight: "bold",
+          fontFamily: "body",
          color: "icon",
          flexDirection: "column",
          ...styles.label
--- a/apps/web/src/views/auth.tsx
+++ b/apps/web/src/views/auth.tsx
@@ -1019,13 +1019,14 @@ function openURL(url: string, force?: boolean) {

 function maskEmail(email: string) {
  if (!email) return "";
-  const [username, domain] = email.split("@");
-  const maskChars = "*".repeat(
-    username.substring(2, username.length - 2).length
-  );
-  return `${username.substring(0, 2)}${maskChars}${username.substring(
-    username.length - 2
-  )}@${domain}`;
+  const [username, provider] = email.split("@");
+  if (username.length === 1) return `****@${provider}`;
+  return email.replace(/(.{1})(.*)(?=@)/, function (gp1, gp2, gp3) {
+    for (let i = 0; i < gp3.length; i++) {
+      gp2 += "*";
+    }
+    return gp2;
+  });
 }

 function isSessionExpired() {
--- a/packages/core/api/subscriptions.js
+++ b/packages/core/api/subscriptions.js
@@ -29,13 +29,13 @@ export default class Subscriptions {
  }

  async cancel() {
-    const token = this._tokenManager.getAccessToken();
+    const token = await this._tokenManager.getAccessToken();
    if (!token) return;
    await http.delete(`${hosts.SUBSCRIPTIONS_HOST}/subscriptions`, token);
  }

  async updateUrl() {
-    const token = this._tokenManager.getAccessToken();
+    const token = await this._tokenManager.getAccessToken();
    if (!token) return;
    return await http.get(
      `${hosts.SUBSCRIPTIONS_HOST}/subscriptions/update_url`,
--- a/packages/core/models/note.js
+++ b/packages/core/models/note.js
@@ -24,6 +24,7 @@ import { getContentFromData } from "../content-types";
 import { CHECK_IDS, checkIsUserPremium } from "../common";
 import { addItem, deleteItem } from "../utils/array";
 import { formatDate } from "../utils/date";
+import qclone from "qclone";

 export default class Note {
  /**
@@ -135,12 +136,14 @@ export default class Note {
  async duplicate() {
    const content = await this._db.content.raw(this._note.contentId);
    return await this._db.notes.add({
-      ...this._note,
+      ...qclone(this._note),
      id: undefined,
-      content: {
-        type: content.type,
-        data: content.data
-      },
+      content: content
+        ? {
+            type: content.type,
+            data: content.data
+          }
+        : undefined,
      readonly: false,
      favorite: false,
      pinned: false,
--- a/packages/editor/src/toolbar/components/dropdown.tsx
+++ b/packages/editor/src/toolbar/components/dropdown.tsx
@@ -64,6 +64,7 @@ export function Dropdown(props: DropdownProps) {
          m: 0,
          bg: isPopupOpen ? "hover" : "transparent",
          mr: 1,
+          flexShrink: 0,
          display: "flex",
          alignItems: "center",
          ":hover": { bg: "hover" },
@@ -75,7 +76,9 @@ export function Dropdown(props: DropdownProps) {
        onMouseDown={(e) => e.preventDefault()}
      >
        {typeof selectedItem === "string" ? (
-          <Text sx={{ fontSize: "subBody", mr: 1, color: "text" }}>
+          <Text
+            sx={{ fontSize: "subBody", mr: 1, color: "text", flexShrink: 0 }}
+          >
            {selectedItem}
          </Text>
        ) : (