[native] [4/40] RN 0.70: Android stuff
ClosedPublic
Actions

Authored by ashoat on Dec 17 2022, 7:31 PM.

Details

Reviewers

tomek
bartek

Commits

rCOMM3773e96bdb12: [native] [4/40] RN 0.70: Android stuff

Summary

These are the Android changes from React Native Upgrade Helper. Exceptions to that are highlighted inline.

Depends on D5897

Test Plan

Tested along with whole stack: test plan

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

ashoat created this revision.Dec 17 2022, 7:31 PM

Herald added a subscriber: atul. · View Herald TranscriptDec 17 2022, 7:31 PM

Harbormaster returned this revision to the author for changes because remote builds failed.Dec 17 2022, 7:32 PM

Harbormaster failed remote builds in B14227: Diff 19461!

ashoat added inline comments.Dec 17 2022, 7:33 PM

native/android/app/CMakeLists.txt
145 ↗	(On Diff #19461)	This file was moved so we need to update where we're pointing to
native/android/app/build.gradle
84 ↗	(On Diff #19461)	To confirm this was safe to remove, I first set it to some incorrect value to see what the error condition would be. I then confirmed that the error condition did not occur with the default value (eg. after I removed the custom value)
86 ↗	(On Diff #19461)	To confirm this was safe to remove, I first set it to some incorrect value to see what the error condition would be. I then confirmed that the error condition did not occur with the default value (eg. after I removed the custom value) For this one, I also did some code sleuthing to see where this was used, and added a log statement to make sure it was being done correctly

ashoat added a child revision: D5899: [native] [5/40] RN 0.70: Update Folly on Android.Dec 17 2022, 7:35 PM

ashoat mentioned this in D5900: [native] [6/40] RN 0.70: Update Android NDK to 24 for M1 hosts.Dec 17 2022, 7:43 PM

Please ignore CI until the end of the stack

Fix cmake-lint error due to line in new file native/android/app/src/main/jni/CMakeLists.txt

Harbormaster failed remote builds in B14276: Diff 19515!Dec 18 2022, 8:39 PM

tomek requested changes to this revision.Dec 19 2022, 4:51 AM

tomek added inline comments.

native/android/app/src/main/java/app/comm/android/MainActivity.java
27–30 ↗	(On Diff #19515)	Why is this method commented out? In the guide it is present.

This revision now requires changes to proceed.Dec 19 2022, 4:51 AM

ashoat added inline comments.Dec 19 2022, 8:12 AM

native/android/app/src/main/java/app/comm/android/MainActivity.java
27–30 ↗	(On Diff #19515)	Oops, good catch. D5935 updates our `createReactActivityDelegate` to use `MainActivityDelegate`, but that's the wrong place to do it... and there is still commented-out code even after that change. I'll fix this up

Actually use MainActivityDelegate

Harbormaster failed remote builds in B14328: Diff 19577!Dec 19 2022, 8:19 AM

tomek accepted this revision.Dec 19 2022, 8:19 AM

This revision is now accepted and ready to land.Dec 19 2022, 8:19 AM

Rebase

Harbormaster failed remote builds in B14543: Diff 19803!Dec 20 2022, 11:03 AM

This revision was landed with ongoing or failed builds.Dec 20 2022, 12:00 PM

Closed by commit rCOMM3773e96bdb12: [native] [4/40] RN 0.70: Android stuff (authored by ashoat). · Explain Why

This revision was automatically updated to reflect the committed changes.

ashoat added a commit: rCOMM3773e96bdb12: [native] [4/40] RN 0.70: Android stuff.

ashoat mentioned this in rCOMM1cebf0c85915: [native] [6/40] RN 0.70: Update Android NDK to 24 for M1 hosts.

Revision Contents
Changeset List

Path

Size

native/

android/

app/

CMakeLists.txt

2 lines

build.gradle

111 lines

src/

debug/

AndroidManifest.xml

2 lines

java/

app/

comm/

android/

ReactNativeFlipper.java

5 lines

main/

AndroidManifest.xml

2 lines

java/

app/

comm/

android/

MainActivity.java

29 lines

MainApplication.java

16 lines

newarchitecture/

MainApplicationReactNativeHost.java

118 lines

components/

MainComponentsRegistry.java

37 lines

modules/

MainApplicationTurboModuleManagerDelegate.java

50 lines

jni/

CMakeLists.txt

6 lines

MainApplicationModuleProvider.h

16 lines

MainApplicationModuleProvider.cpp

32 lines

MainApplicationTurboModuleManagerDelegate.h

38 lines

MainApplicationTurboModuleManagerDelegate.cpp

45 lines

MainComponentsRegistry.h

32 lines

MainComponentsRegistry.cpp

65 lines

OnLoad.cpp

11 lines

build.gradle

19 lines

gradle.properties

22 lines

gradle/

wrapper/

gradle-wrapper.jar

gradle-wrapper.properties

2 lines

gradlew

257 lines

settings.gradle

8 lines

Diff 19844

View Options

native/android/app/CMakeLists.txt

Show All 17 Lines	import {
type RoleChangeRequest,		type RoleChangeRequest,
type ChangeThreadSettingsResult,		type ChangeThreadSettingsResult,
type RemoveMembersRequest,		type RemoveMembersRequest,
type LeaveThreadRequest,		type LeaveThreadRequest,
type LeaveThreadResult,		type LeaveThreadResult,
type UpdateThreadRequest,		type UpdateThreadRequest,
type ServerThreadJoinRequest,		type ServerThreadJoinRequest,
type ThreadJoinResult,		type ThreadJoinResult,
		type ToggleMessagePinRequest,
threadPermissions,		threadPermissions,
threadTypes,		threadTypes,
} from 'lib/types/thread-types.js';		} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js';		import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js';		import { ServerError } from 'lib/utils/errors.js';
import { promiseAll } from 'lib/utils/promises.js';		import { promiseAll } from 'lib/utils/promises.js';
import { firstLine } from 'lib/utils/string-utils.js';		import { firstLine } from 'lib/utils/string-utils.js';

▲ Show 20 Lines • Show All 815 Lines • ▼ Show 20 Lines	updateDatas.push({
threadID: threadID,		threadID: threadID,
targetSession: viewer.session,		targetSession: viewer.session,
});		});
}		}

await createUpdates(updateDatas);		await createUpdates(updateDatas);
}		}

		async function toggleMessagePinForThread(
		viewer: Viewer,
		request: ToggleMessagePinRequest,
		): Promise<void> {
		const { messageID, action } = request;

		const threadQuery = SQL`SELECT thread FROM messages WHERE id = ${messageID}`;
		const [threadResult] = await dbQuery(threadQuery);
		const threadID = threadResult[0].thread.toString();

		const hasPermission = await checkThreadPermission(
		viewer,
		threadID,
		threadPermissions.MANAGE_PINS,
		);

		if (!hasPermission) {
		throw new ServerError('invalid_credentials');
		}

		const pinnedValue = action === 'pin' ? 1 : 0;
		const pinTimeValue = action === 'pin' ? Date.now() : null;

		const togglePinQuery = SQL`
		UPDATE messages
		SET pinned = ${pinnedValue}, pin_time = ${pinTimeValue}
		WHERE id = ${messageID} AND thread = ${threadID}
		`;

		await dbQuery(togglePinQuery);
		}

export {		export {
updateRole,		updateRole,
removeMembers,		removeMembers,
leaveThread,		leaveThread,
updateThread,		updateThread,
joinThread,		joinThread,
updateThreadMembers,		updateThreadMembers,
		toggleMessagePinForThread,
};		};

View Options

native/android/app/build.gradle

Show All 17 Lines	import {
type RoleChangeRequest,		type RoleChangeRequest,
type ChangeThreadSettingsResult,		type ChangeThreadSettingsResult,
type RemoveMembersRequest,		type RemoveMembersRequest,
type LeaveThreadRequest,		type LeaveThreadRequest,
type LeaveThreadResult,		type LeaveThreadResult,
type UpdateThreadRequest,		type UpdateThreadRequest,
type ServerThreadJoinRequest,		type ServerThreadJoinRequest,
type ThreadJoinResult,		type ThreadJoinResult,
		type ToggleMessagePinRequest,
threadPermissions,		threadPermissions,
threadTypes,		threadTypes,
} from 'lib/types/thread-types.js';		} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js';		import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js';		import { ServerError } from 'lib/utils/errors.js';
import { promiseAll } from 'lib/utils/promises.js';		import { promiseAll } from 'lib/utils/promises.js';
import { firstLine } from 'lib/utils/string-utils.js';		import { firstLine } from 'lib/utils/string-utils.js';

▲ Show 20 Lines • Show All 815 Lines • ▼ Show 20 Lines	updateDatas.push({
threadID: threadID,		threadID: threadID,
targetSession: viewer.session,		targetSession: viewer.session,
});		});
}		}

await createUpdates(updateDatas);		await createUpdates(updateDatas);
}		}

		async function toggleMessagePinForThread(
		viewer: Viewer,
		request: ToggleMessagePinRequest,
		): Promise<void> {
		const { messageID, action } = request;

		const threadQuery = SQL`SELECT thread FROM messages WHERE id = ${messageID}`;
		const [threadResult] = await dbQuery(threadQuery);
		const threadID = threadResult[0].thread.toString();

		const hasPermission = await checkThreadPermission(
		viewer,
		threadID,
		threadPermissions.MANAGE_PINS,
		);

		if (!hasPermission) {
		throw new ServerError('invalid_credentials');
		}

		const pinnedValue = action === 'pin' ? 1 : 0;
		const pinTimeValue = action === 'pin' ? Date.now() : null;

		const togglePinQuery = SQL`
		UPDATE messages
		SET pinned = ${pinnedValue}, pin_time = ${pinTimeValue}
		WHERE id = ${messageID} AND thread = ${threadID}
		`;

		await dbQuery(togglePinQuery);
		}

export {		export {
updateRole,		updateRole,
removeMembers,		removeMembers,
leaveThread,		leaveThread,
updateThread,		updateThread,
joinThread,		joinThread,
updateThreadMembers,		updateThreadMembers,
		toggleMessagePinForThread,
};		};

View Options

native/android/app/src/debug/AndroidManifest.xml

Show All 17 Lines	import {
type RoleChangeRequest,		type RoleChangeRequest,
type ChangeThreadSettingsResult,		type ChangeThreadSettingsResult,
type RemoveMembersRequest,		type RemoveMembersRequest,
type LeaveThreadRequest,		type LeaveThreadRequest,
type LeaveThreadResult,		type LeaveThreadResult,
type UpdateThreadRequest,		type UpdateThreadRequest,
type ServerThreadJoinRequest,		type ServerThreadJoinRequest,
type ThreadJoinResult,		type ThreadJoinResult,
		type ToggleMessagePinRequest,
threadPermissions,		threadPermissions,
threadTypes,		threadTypes,
} from 'lib/types/thread-types.js';		} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js';		import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js';		import { ServerError } from 'lib/utils/errors.js';
import { promiseAll } from 'lib/utils/promises.js';		import { promiseAll } from 'lib/utils/promises.js';
import { firstLine } from 'lib/utils/string-utils.js';		import { firstLine } from 'lib/utils/string-utils.js';

▲ Show 20 Lines • Show All 815 Lines • ▼ Show 20 Lines	updateDatas.push({
threadID: threadID,		threadID: threadID,
targetSession: viewer.session,		targetSession: viewer.session,
});		});
}		}

await createUpdates(updateDatas);		await createUpdates(updateDatas);
}		}

		async function toggleMessagePinForThread(
		viewer: Viewer,
		request: ToggleMessagePinRequest,
		): Promise<void> {
		const { messageID, action } = request;

		const threadQuery = SQL`SELECT thread FROM messages WHERE id = ${messageID}`;
		const [threadResult] = await dbQuery(threadQuery);
		const threadID = threadResult[0].thread.toString();

		const hasPermission = await checkThreadPermission(
		viewer,
		threadID,
		threadPermissions.MANAGE_PINS,
		);

		if (!hasPermission) {
		throw new ServerError('invalid_credentials');
		}

		const pinnedValue = action === 'pin' ? 1 : 0;
		const pinTimeValue = action === 'pin' ? Date.now() : null;

		const togglePinQuery = SQL`
		UPDATE messages
		SET pinned = ${pinnedValue}, pin_time = ${pinTimeValue}
		WHERE id = ${messageID} AND thread = ${threadID}
		`;

		await dbQuery(togglePinQuery);
		}

export {		export {
updateRole,		updateRole,
removeMembers,		removeMembers,
leaveThread,		leaveThread,
updateThread,		updateThread,
joinThread,		joinThread,
updateThreadMembers,		updateThreadMembers,
		toggleMessagePinForThread,
};		};

View Options

native/android/app/src/debug/java/app/comm/android/ReactNativeFlipper.java

Show All 17 Lines	import {
type RoleChangeRequest,		type RoleChangeRequest,
type ChangeThreadSettingsResult,		type ChangeThreadSettingsResult,
type RemoveMembersRequest,		type RemoveMembersRequest,
type LeaveThreadRequest,		type LeaveThreadRequest,
type LeaveThreadResult,		type LeaveThreadResult,
type UpdateThreadRequest,		type UpdateThreadRequest,
type ServerThreadJoinRequest,		type ServerThreadJoinRequest,
type ThreadJoinResult,		type ThreadJoinResult,
		type ToggleMessagePinRequest,
threadPermissions,		threadPermissions,
threadTypes,		threadTypes,
} from 'lib/types/thread-types.js';		} from 'lib/types/thread-types.js';
import { updateTypes } from 'lib/types/update-types.js';		import { updateTypes } from 'lib/types/update-types.js';
import { ServerError } from 'lib/utils/errors.js';		import { ServerError } from 'lib/utils/errors.js';
import { promiseAll } from 'lib/utils/promises.js';		import { promiseAll } from 'lib/utils/promises.js';
import { firstLine } from 'lib/utils/string-utils.js';		import { firstLine } from 'lib/utils/string-utils.js';

▲ Show 20 Lines • Show All 815 Lines • ▼ Show 20 Lines	updateDatas.push({
threadID: threadID,		threadID: threadID,
targetSession: viewer.session,		targetSession: viewer.session,
});		});
}		}

await createUpdates(updateDatas);		await createUpdates(updateDatas);
}		}

		async function toggleMessagePinForThread(
		viewer: Viewer,
		request: ToggleMessagePinRequest,
		): Promise<void> {
		const { messageID, action } = request;

		const threadQuery = SQL`SELECT thread FROM messages WHERE id = ${messageID}`;
		const [threadResult] = await dbQuery(threadQuery);
		const threadID = threadResult[0].thread.toString();

		const hasPermission = await checkThreadPermission(
		viewer,
		threadID,
		threadPermissions.MANAGE_PINS,
		);

		if (!hasPermission) {
		throw new ServerError('invalid_credentials');
		}

		const pinnedValue = action === 'pin' ? 1 : 0;
		const pinTimeValue = action === 'pin' ? Date.now() : null;

		const togglePinQuery = SQL`
		UPDATE messages
		SET pinned = ${pinnedValue}, pin_time = ${pinTimeValue}
		WHERE id = ${messageID} AND thread = ${threadID}
		`;

		await dbQuery(togglePinQuery);
		}

export {		export {
updateRole,		updateRole,
removeMembers,		removeMembers,
leaveThread,		leaveThread,
updateThread,		updateThread,
joinThread,		joinThread,
updateThreadMembers,		updateThreadMembers,
		toggleMessagePinForThread,
};		};