Skip to content

Commit 546d7f2

Browse files
authored
Merge pull request #401 from ganeshrvel/revert-400-release/3.2.26
Revert "Release 3.2.26"
2 parents 8ebc045 + 9245a0f commit 546d7f2

File tree

6 files changed

+2
-79
lines changed

6 files changed

+2
-79
lines changed

README.md

+1-47
Original file line numberDiff line numberDiff line change
@@ -296,53 +296,7 @@ $ set UPGRADE_EXTENSIONS=1 && npm run dev
296296

297297
### Troubleshooting
298298

299-
#### Error while building the app - `No module named 'distutils'`
300-
301-
To resolve this issue, install Python setuptools:
302-
303-
```shell
304-
brew install python-setuptools
305-
```
306-
307-
#### Error: npm version issue due to node-gyp bug
308-
309-
If you encounter an error message like:
310-
311-
```txt
312-
Error: This project requires npm version >=6.x <=8.16.0. You have version 10.24.0.
313-
Please downgrade your npm, this is due to a bug in node-gyp.
314-
GitHub issue: https://github.com/ganeshrvel/openmtp/issues/367.
315-
command: npm install -g npm@8.16.0
316-
```
317-
318-
Follow these steps:
319-
320-
1. If you use `nvm`, switch to Node.js version `16.19.0`:
321-
322-
```shell
323-
nvm install 16.19.0
324-
nvm use 16.19.0
325-
```
326-
327-
2. Then, install the compatible npm version:
328-
329-
```shell
330-
npm install -g npm@8.16.0
331-
```
332-
333-
#### For non-nvm users
334-
335-
If you don't use `nvm`, you can directly install Node.js version `16.19.0` from the [official website](https://nodejs.org/en/download/releases/), or you can use a package manager like `brew` to install the correct version:
336-
337-
```shell
338-
brew install node@16
339-
```
340-
341-
After installation, ensure npm is downgraded to the required version:
342-
343-
```shell
344-
npm install -g npm@8.16.0
345-
```
299+
#### Your device is not recognized
346300

347301
#### **node-mac-permissions** throws `Speech framework is not compatible with macOS < 10.15`
348302

app/constants/index.js

-2
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,3 @@ export const DELETE_KEIS_SMARTSWITCH_URL = `https://farazfazli.medium.com/how-i-
5656
export const USB_HOTPLUG_MAX_ATTEMPTS = 6;
5757

5858
export const USB_HOTPLUG_MAX_ATTEMPTS_TIMEOUT = 15000; // in ms
59-
60-
export const GANESHR_PORTFOLIO_URL = 'https://www.ganeshrvel.com/?c=openmtp'; // in ms

app/containers/HomePage/components/FileExplorer.jsx

-17
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ import {
6767
import {
6868
BUY_ME_A_COFFEE_URL,
6969
DEVICES_LABEL,
70-
GANESHR_PORTFOLIO_URL,
7170
SUPPORT_PAYPAL_URL,
7271
USB_HOTPLUG_MAX_ATTEMPTS,
7372
USB_HOTPLUG_MAX_ATTEMPTS_TIMEOUT,
@@ -1986,11 +1985,6 @@ class FileExplorer extends Component {
19861985
});
19871986
};
19881987

1989-
_handlePortfolioUrlTap = () => {
1990-
analyticsService.sendEvent(EVENT_TYPE.GANESHR_PORTFOLIO_URL, {});
1991-
openExternalUrl(GANESHR_PORTFOLIO_URL);
1992-
};
1993-
19941988
render() {
19951989
const {
19961990
classes: styles,
@@ -2067,17 +2061,6 @@ class FileExplorer extends Component {
20672061
maxWidthDialog="sm"
20682062
helpText="If the progress bar freezes while transferring the files, restart the app and reconnect the device. This is a known Android MTP bug."
20692063
>
2070-
<Typography className={styles.buildProduct}>
2071-
{`Are you building a product and looking for expert tech talent to drive it forward? `}
2072-
<span
2073-
onClick={this._handlePortfolioUrlTap}
2074-
className={classnames(styles.connectPortfolioUrl)}
2075-
>
2076-
Let’s connect
2077-
</span>
2078-
!
2079-
</Typography>
2080-
20812064
<div className={styles.socialMediaShareContainer}>
20822065
<Typography className={styles.supportBtnsTitle}>
20832066
{`I've invested a significant amount of my time and energy into developing and maintaining this OpenSource application.`}

app/containers/HomePage/styles/FileExplorer.js

-9
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ export const styles = (theme) => ({
1313
supportBtnsBoldText: {
1414
fontWeight: 'bold',
1515
},
16-
buildProduct: {
17-
marginTop: 10,
18-
fontSize: 13,
19-
fontWeight: 500,
20-
},
21-
connectPortfolioUrl: {
22-
cursor: `pointer`,
23-
color: theme.palette.secondary.main,
24-
},
2516
socialMediaShareTitle: {
2617
marginTop: 10,
2718
fontSize: 11,

app/enums/events.js

-3
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,4 @@ export const EVENT_TYPE = {
151151
// actions
152152
EXTERNAL_DRAG_FILES_DROPPED: 'EXTERNAL_DRAG_FILES_DROPPED',
153153
EXTERNAL_DRAG_FILES_CANCELLED: 'EXTERNAL_DRAG_FILES_CANCELLED',
154-
155-
// actions
156-
GANESHR_PORTFOLIO_URL: 'GANESHR_PORTFOLIO_URL',
157154
};

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openmtp",
33
"productName": "OpenMTP",
4-
"version": "3.2.26",
4+
"version": "3.2.25",
55
"description": "OpenMTP | Android File Transfer for macOS",
66
"scripts": {
77
"build": "yarn lint && concurrently \"yarn build-main\" \"yarn build-renderer\"",

0 commit comments

Comments
 (0)