Skip to content

Commit

Permalink
Merge pull request #354 from ganeshrvel/release/3.2.20
Browse files Browse the repository at this point in the history
Release/3.2.20
  • Loading branch information
ganeshrvel authored Apr 26, 2024
2 parents 34ed92b + 5bb0e4a commit 91cc8f7
Show file tree
Hide file tree
Showing 19 changed files with 378 additions and 262 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ If you are interested in fixing issues and contributing directly to the code bas

Help me keep the app FREE and open for all.

- Donate Via PayPal: [paypal.me/ganeshrvel](https://paypal.me/ganeshrvel 'https://paypal.me/ganeshrvel')
- Support us via PayPal: [paypal.me/ganeshrvel](https://paypal.me/ganeshrvel 'https://paypal.me/ganeshrvel')
- Buy Me A Coffee (UPI, PayPal, Credit/Debit Cards, Internet Banking): [buymeacoffee.com/ganeshrvel](https://buymeacoffee.com/ganeshrvel 'https://buymeacoffee.com/ganeshrvel')

### Contacts
Expand Down
2 changes: 1 addition & 1 deletion app/constants/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const FILE_EXPLORER_TABLE_TRUNCATE_MAX_CHARS = 37;

export const FILE_EXPLORER_GRID_TRUNCATE_MAX_CHARS = 20;

export const DONATE_PAYPAL_URL = `https://paypal.me/ganeshrvel`;
export const SUPPORT_PAYPAL_URL = `https://paypal.me/ganeshrvel`;

export const BUY_ME_A_COFFEE_URL = `https://www.buymeacoffee.com/ganeshrvel`;

Expand Down
2 changes: 1 addition & 1 deletion app/constants/onboarding.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// most recently used version number to show the onboarding screen
// search keywords: new, next, update, onboarding
export const latestUpdatePushVersion = '3.2.0-beta.1';
export const latestUpdatePushVersion = '3.2.20';
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import {
BUY_ME_A_COFFEE_URL,
DELETE_KEIS_SMARTSWITCH_URL,
DEVICES_LABEL,
DONATE_PAYPAL_URL,
SUPPORT_PAYPAL_URL,
} from '../../../constants';
import { DEVICE_TYPE, MTP_MODE } from '../../../enums';
import {
Expand Down Expand Up @@ -308,13 +308,13 @@ class HelpPhoneNotRecognized extends PureComponent {
</Typography>
<Typography component="p" variant="body2" paragraph>
If you&apos;d like to support my work or buy me up a cup of
coffee, donate via&nbsp;Paypal:&nbsp;
coffee, you can contribute via&nbsp;Paypal:&nbsp;
<a
onClick={(events) => {
openExternalUrl(DONATE_PAYPAL_URL, events);
openExternalUrl(SUPPORT_PAYPAL_URL, events);
}}
>
{DONATE_PAYPAL_URL}
{SUPPORT_PAYPAL_URL}
</a>
&nbsp;or Buy me a coffee:&nbsp;
<a
Expand Down
8 changes: 4 additions & 4 deletions app/containers/HomePage/components/FileExplorer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ import {
import {
BUY_ME_A_COFFEE_URL,
DEVICES_LABEL,
DONATE_PAYPAL_URL,
SUPPORT_PAYPAL_URL,
USB_HOTPLUG_MAX_ATTEMPTS,
USB_HOTPLUG_MAX_ATTEMPTS_TIMEOUT,
} from '../../../constants';
Expand Down Expand Up @@ -111,7 +111,7 @@ import { analyticsService } from '../../../services/analytics';
import { EVENT_TYPE } from '../../../enums/events';
import {
buyMeACoffeeText,
donateUsingPayPal,
supportUsingPayPal,
} from '../../../templates/fileExplorer';
import { fileExistsSync } from '../../../helpers/fileOps';
import { getRemoteWindow } from '../../../helpers/remoteWindowHelpers';
Expand All @@ -126,9 +126,9 @@ let multipleSelectDirection = null;
const donationBtnsList = [
{
enabled: true,
label: donateUsingPayPal,
label: supportUsingPayPal,
icon: faPaypal,
url: DONATE_PAYPAL_URL,
url: SUPPORT_PAYPAL_URL,
invert: false,
},
{
Expand Down
10 changes: 5 additions & 5 deletions app/containers/HomePage/components/ToolbarAreaPane.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
import {
BUY_ME_A_COFFEE_URL,
DEVICES_DEFAULT_PATH,
DONATE_PAYPAL_URL,
SUPPORT_PAYPAL_URL,
} from '../../../constants';
import { selectMtpMode, toggleSettings } from '../../Settings/actions';
import { toggleWindowSizeOnDoubleClick } from '../../../helpers/titlebarDoubleClick';
Expand Down Expand Up @@ -225,8 +225,8 @@ class ToolbarAreaPane extends PureComponent {
openExternalUrl(BUY_ME_A_COFFEE_URL);
};

_handleOpenDonateUsingPaypal = () => {
openExternalUrl(DONATE_PAYPAL_URL);
_handleOpenSupportUsingPaypal = () => {
openExternalUrl(SUPPORT_PAYPAL_URL);
};

_handleToolbarAction = (itemType, isAccelerator = false) => {
Expand Down Expand Up @@ -301,8 +301,8 @@ class ToolbarAreaPane extends PureComponent {
break;

case 'paypal':
this._handleOpenDonateUsingPaypal();
analyticsService.sendEvent(EVENT_TYPE.DONATE_USING_PAYPAL, {});
this._handleOpenSupportUsingPaypal();
analyticsService.sendEvent(EVENT_TYPE.SUPPORT_USING_PAYPAL, {});

break;

Expand Down
4 changes: 2 additions & 2 deletions app/containers/HomePage/reducers.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
import { DEVICE_TYPE } from '../../enums';
import {
buyMeACoffeeText,
donateUsingPayPal,
supportUsingPayPal,
} from '../../templates/fileExplorer';
import { isKalamModeSupported } from '../../helpers/binaries';

Expand Down Expand Up @@ -125,7 +125,7 @@ export const initialState = {
},
paypal: {
enabled: true,
label: donateUsingPayPal,
label: supportUsingPayPal,
icon: faPaypal,
},
buyMeACoffee: {
Expand Down
45 changes: 36 additions & 9 deletions app/containers/Onboarding/components/Features.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
import SettingsOverscanIcon from '@material-ui/icons/SettingsOverscan';
import HourglassFullIcon from '@material-ui/icons/HourglassFull';
import TabIcon from '@material-ui/icons/Tab';
import MemoryIcon from '@material-ui/icons/Memory';
import SmartphoneIcon from '@material-ui/icons/Smartphone';
import CameraRollIcon from '@material-ui/icons/CameraRoll';
import KeyboadShortcuts from '../../KeyboardShortcutsPage/components/KeyboadShortcuts';
import { styles } from '../styles/Features';
import { capitalize } from '../../../utils/funcs';
Expand Down Expand Up @@ -105,6 +108,28 @@ class Features extends PureComponent {
</ListItemIcon>
<ListItemText primary="Transfer multiple files which are larger than 4GB in one go." />
</ListItem>

<ListItem>
<ListItemIcon>
<MemoryIcon />
</ListItemIcon>
<ListItemText primary="Apple Silicon support" />
</ListItem>

<ListItem>
<ListItemIcon>
<SmartphoneIcon />
</ListItemIcon>
<ListItemText primary={`Garmin device support`} />
</ListItem>

<ListItem>
<ListItemIcon>
<CameraRollIcon />
</ListItemIcon>
<ListItemText primary={`Fujifilm device support`} />
</ListItem>

<ListItem>
<ListItemIcon>
<ViewListIcon />
Expand Down Expand Up @@ -149,6 +174,16 @@ class Features extends PureComponent {
<ListItemText primary="Auto device detection (USB Hotplug)" />
</ListItem>

<ListItem>
<ListItemIcon>
<HourglassFullIcon />
</ListItemIcon>
<ListItemText
primary="Display Overall Progress on the File Transfer Screen"
secondary="Settings > File Manager Tab > Enable 'Display overall progress on the file transfer screen'"
/>
</ListItem>

<ListItem
button
onClick={() =>
Expand All @@ -174,15 +209,7 @@ class Features extends PureComponent {
<ExpandMoreIcon />
)}
</ListItem>
<ListItem>
<ListItemIcon>
<HourglassFullIcon />
</ListItemIcon>
<ListItemText
primary="Overall progress on the file transfer screen"
secondary="Settings > 'File Manager' Tab > 'Display overall progress on the file transfer screen'"
/>
</ListItem>

<Collapse
in={expansionPanel.keyboardNavigation}
timeout="auto"
Expand Down
32 changes: 8 additions & 24 deletions app/containers/Onboarding/components/WhatsNew.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import ListItem from '@material-ui/core/ListItem';
import ListItemIcon from '@material-ui/core/ListItemIcon';
import ListItemText from '@material-ui/core/ListItemText';
import BuildIcon from '@material-ui/icons/Build';
import SmartphoneIcon from '@material-ui/icons/Smartphone';
import CameraRollIcon from '@material-ui/icons/CameraRoll';
import MemoryIcon from '@material-ui/icons/Memory';
import BugReportIcon from '@material-ui/icons/BugReport';
import SystemUpdate from '@material-ui/icons/SystemUpdate';
import { styles } from '../styles/WhatsNew';
import { APP_NAME, APP_VERSION } from '../../../constants/meta';
Expand All @@ -33,6 +31,13 @@ class WhatsNew extends PureComponent {
)}

<List>
<ListItem>
<ListItemIcon>
<BugReportIcon htmlColor="#FF0000" />
</ListItemIcon>
<ListItemText primary="Fixes a bug which caused slow data transfer speed" />
</ListItem>

{isKalamModeDisabled && (
<ListItem>
<ListItemIcon>
Expand All @@ -45,27 +50,6 @@ class WhatsNew extends PureComponent {
</ListItem>
)}

<ListItem>
<ListItemIcon>
<MemoryIcon htmlColor="#fa4d0a" />
</ListItemIcon>
<ListItemText primary="Much awaited Apple Silicon support" />
</ListItem>

<ListItem>
<ListItemIcon>
<SmartphoneIcon />
</ListItemIcon>
<ListItemText primary={`Garmin device support`} />
</ListItem>

<ListItem>
<ListItemIcon>
<CameraRollIcon />
</ListItemIcon>
<ListItemText primary={`Fujifilm device support`} />
</ListItem>

<ListItem>
<ListItemIcon>
<BuildIcon />
Expand Down
2 changes: 1 addition & 1 deletion app/enums/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const EVENT_TYPE = {
FILE_TRANSFER_COMPLETED: 'FILE_TRANSFER_COMPLETED',
FILE_TRANSFER_ERROR: 'FILE_TRANSFER_ERROR',
BUY_ME_A_COFFEE: 'BUY_ME_A_COFFEE',
DONATE_USING_PAYPAL: 'DONATE_USING_PAYPAL',
SUPPORT_USING_PAYPAL: 'SUPPORT_USING_PAYPAL',

// toolbar
TOOLBAR_SETTINGS_DIALOG_OPEN: 'TOOLBAR_SETTINGS_DIALOG_OPEN',
Expand Down
2 changes: 1 addition & 1 deletion app/templates/fileExplorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export const helpPhoneNotConnecting = `FAQs - My phone is not connecting!`;

export const buyMeACoffeeText = `Buy me a Coffee (UPI, PayPal, Credit/Debit Cards, Internet Banking)`;

export const donateUsingPayPal = `Donate using PayPal`;
export const supportUsingPayPal = `Support us via PayPal`;
Binary file modified build/mac/bin/amd64/kalam.dylib
Binary file not shown.
Binary file modified build/mac/bin/amd64/kalam_debug_report
Binary file not shown.
Binary file modified build/mac/bin/arm64/kalam.dylib
Binary file not shown.
Binary file modified build/mac/bin/arm64/kalam_debug_report
Binary file not shown.
4 changes: 2 additions & 2 deletions ffi/kalam/native/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module kalam
go 1.16

require (
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20221105040909-77ef22eca9ca
github.com/ganeshrvel/go-mtpx v0.0.0-20221105041206-b8aa8311a1ed
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20240426083057-1c3302b3c476
github.com/ganeshrvel/go-mtpx v0.0.0-20240426092756-18f12db021cc
github.com/json-iterator/go v1.1.12
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
)
Expand Down
19 changes: 4 additions & 15 deletions ffi/kalam/native/go.sum
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20221101152421-27ccd6f3da48 h1:uvKKig6Coc7ZtlPMmqw0jCdAsZAR4HpgMEiaTjRyJd0=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20221101152421-27ccd6f3da48/go.mod h1:9YMioQ4ZX91bgYt9kW1tsQAUDhwAulrU18TN2w1VRYo=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20221104074511-0d40588840c5 h1:IRPH3s7zrSi0Gs+gaUHtiLThFj4FnsRMga6l0kBS93U=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20221104074511-0d40588840c5/go.mod h1:9YMioQ4ZX91bgYt9kW1tsQAUDhwAulrU18TN2w1VRYo=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20221105040909-77ef22eca9ca h1:MsSczxpTwIEht0zsQ+FAW3CTMP06icGRrWTFerfBofs=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20221105040909-77ef22eca9ca/go.mod h1:9YMioQ4ZX91bgYt9kW1tsQAUDhwAulrU18TN2w1VRYo=
github.com/ganeshrvel/go-mtpx v0.0.0-20221101160947-74b5217d9caa h1:wMJSiUPxkJVRWX82UECTMJDycQK6lWslKum9EmwxQH8=
github.com/ganeshrvel/go-mtpx v0.0.0-20221101160947-74b5217d9caa/go.mod h1:RuxddC8oT612m/f0o9ugTsU0nrovnTmoA3HWf8JkBjQ=
github.com/ganeshrvel/go-mtpx v0.0.0-20221105041206-b8aa8311a1ed h1:QohyXSzrk1ICh1M3fuNL2IKV0pss+fowek/R5zcU1zo=
github.com/ganeshrvel/go-mtpx v0.0.0-20221105041206-b8aa8311a1ed/go.mod h1:yURXLWISiTh2hQdQ7quNJZaZB0eN/Z/VB0fDGISMaGE=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20240426083057-1c3302b3c476 h1:bGxYEtLyrTGw1zbjUpCR2YjwrTFYEDd4cIN1R5ErfNI=
github.com/ganeshrvel/go-mtpfs v1.0.4-0.20240426083057-1c3302b3c476/go.mod h1:9YMioQ4ZX91bgYt9kW1tsQAUDhwAulrU18TN2w1VRYo=
github.com/ganeshrvel/go-mtpx v0.0.0-20240426092756-18f12db021cc h1:v5UGEyES906tX/Ia3gmQUiI4AeT8XccP9lemfeWj1Mk=
github.com/ganeshrvel/go-mtpx v0.0.0-20240426092756-18f12db021cc/go.mod h1:VAgywgvG/yQHitxGPLunPV0JNCfr0n186F7ep1xnzIo=
github.com/ganeshrvel/usb v0.0.0-20210103155855-14d96f5ae403 h1:TV7BaPjblLxwKn0pv5d9xDEMp0KrP+KT4DeoNPK8npk=
github.com/ganeshrvel/usb v0.0.0-20210103155855-14d96f5ae403/go.mod h1:2UUL4RuHDu1vhgX8t/QkPZqj2GaW/SCtTYdhx+Gxv5c=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/hanwen/go-fuse v1.0.0 h1:GxS9Zrn6c35/BnfiVsZVWmsG803xwE7eVRDvcf/BEVc=
github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok=
github.com/hanwen/go-fuse/v2 v2.0.3 h1:kpV28BKeSyVgZREItBLnaVBvOEwv2PuhNdKetwnvNHo=
github.com/hanwen/go-fuse/v2 v2.0.3/go.mod h1:0EQM6aH2ctVpvZ6a+onrQ/vaykxh2GH7hy3e13vzTUY=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand All @@ -45,7 +36,5 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201231184435-2d18734c6014 h1:joucsQqXmyBVxViHCPFjG3hx8JzIFSaym3l3MM/Jsdg=
golang.org/x/sys v0.0.0-20201231184435-2d18734c6014/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "openmtp",
"productName": "OpenMTP",
"version": "3.2.10",
"version": "3.2.20",
"description": "OpenMTP | Android File Transfer for macOS",
"scripts": {
"build": "yarn lint && concurrently \"yarn build-main\" \"yarn build-renderer\"",
Expand Down Expand Up @@ -119,8 +119,8 @@
"reselect": "^4.0.0",
"roboto-fontface": "^0.10.0",
"run-electron": "^1.0.0",
"sanitize-html": "^2.8.1",
"semver": "^7.3.5",
"sanitize-html": "^2.13.0",
"semver": "^7.6.0",
"source-map-support": "^0.5.21",
"styled-components": "^4.4.1",
"url": "^0.11.0",
Expand Down Expand Up @@ -155,7 +155,7 @@
"@babel/register": "^7.18.9",
"@sentry/cli": "^2.11.0",
"@sentry/webpack-plugin": "^1.20.0",
"axios": "^0.27.2",
"axios": "^1.6.8",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.2",
Expand Down Expand Up @@ -195,7 +195,7 @@
"node-abi": "^3.24.0",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"pkg-dir": "^6.0.1",
"postcss": "8",
"postcss": "8.4.31",
"prettier": "^2.7.1",
"prettier-stylelint": "https://github.com/ganeshrvel/prettier-stylelint.git",
"react-hot-loader": "^4.13.0",
Expand All @@ -210,7 +210,7 @@
"stylelint-config-standard": "^29.0.0",
"terser-webpack-plugin": "^5.3.6",
"url-loader": "^4.1.1",
"webpack": "^5.3.2",
"webpack": "^5.76.0",
"webpack-bundle-analyzer": "^3.9.0",
"webpack-cli": "^4.0.0",
"webpack-dev-server": "^3.11.0",
Expand Down
Loading

0 comments on commit 91cc8f7

Please sign in to comment.