Page MenuHomePhabricator
Differential D5898

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

Authored by ashoat on Dec 17 2022, 7:31 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 7:46 AM
Unknown Object (File)
Mon, Mar 3, 5:54 PM
Unknown Object (File)
Mon, Mar 3, 5:54 PM
Unknown Object (File)
Mon, Mar 3, 5:40 PM
Unknown Object (File)
Feb 24 2025, 10:33 PM
Unknown Object (File)
Feb 19 2025, 7:55 AM
Unknown Object (File)
Feb 17 2025, 8:56 PM
Unknown Object (File)
Feb 16 2025, 8:30 PM
View All Files
Subscribers
atul

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
No Lint Coverage
Unit
No Test Coverage

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
ashoat requested review of this revision.Dec 17 2022, 8:07 PM

Please ignore CI until the end of the stack

ashoat updated this revision to Diff 19515.Dec 18 2022, 8:26 PM

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

ashoat updated this revision to Diff 19577.Dec 19 2022, 8:15 AM

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
ashoat updated this revision to Diff 19803.Dec 20 2022, 10:59 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

Diff 19577

View Options

native/android/app/CMakeLists.txt

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::put_request; use proto::put_request;
use proto::put_request::Data::*; use proto::put_request::Data::*;
use proto::PutRequest; use proto::PutRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, c_char_pointer_to_string_new, check_error, c_char_pointer_to_string, c_char_pointer_to_string_new, report_error, string_to_c_char_pointer_new,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail; use anyhow::bail;
use crate::RUNTIME; use crate::RUNTIME;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
▲ Show 20 Lines • Show All 168 Lines • ▼ Show 20 Lines if let Ok(mut grpc_client) =
} }
return Err(format!("could not access client for holder {}", holder)); return Err(format!("could not access client for holder {}", holder));
} }
Err("could not successfully connect to the blob server".to_string()) Err("could not successfully connect to the blob server".to_string())
} }
pub fn put_client_blocking_read_cxx( pub fn put_client_blocking_read_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<String, String> { ) -> anyhow::Result<String, anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; Ok(RUNTIME.block_on(async {
let response: Option<String> = RUNTIME.block_on(async {
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.get_mut(&holder); let maybe_client = clients.get_mut(&holder);
if let Some(client) = maybe_client { if let Some(client) = maybe_client {
if let Some(data) = client.rx.recv().await { if let Some(data) = client.rx.recv().await {
return Some(data); return Ok(data);
} else { } else {
report_error( bail!("couldn't receive data via client's receiver");
&ERROR_MESSAGES,
"couldn't receive data via client's receiver",
Some("put"),
);
} }
} else { } else {
report_error( bail!(format!("no client detected for {} in blocking read", holder));
&ERROR_MESSAGES,
"no client detected in blocking read",
Some("put"),
);
} }
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("put")); bail!("couldn't access clients");
} }
None })?)
});
check_error(&ERROR_MESSAGES)?;
response.ok_or("response not received properly".to_string())
} }
/** /**
* field index: * field index:
* 1 - holder (utf8 string) * 1 - holder (utf8 string)
* 2 - blob hash (utf8 string) * 2 - blob hash (utf8 string)
* 3 - data chunk (bytes) * 3 - data chunk (bytes)
*/ */
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines
View Options

native/android/app/build.gradle

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::put_request; use proto::put_request;
use proto::put_request::Data::*; use proto::put_request::Data::*;
use proto::PutRequest; use proto::PutRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, c_char_pointer_to_string_new, check_error, c_char_pointer_to_string, c_char_pointer_to_string_new, report_error, string_to_c_char_pointer_new,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail; use anyhow::bail;
use crate::RUNTIME; use crate::RUNTIME;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
▲ Show 20 Lines • Show All 168 Lines • ▼ Show 20 Lines if let Ok(mut grpc_client) =
} }
return Err(format!("could not access client for holder {}", holder)); return Err(format!("could not access client for holder {}", holder));
} }
Err("could not successfully connect to the blob server".to_string()) Err("could not successfully connect to the blob server".to_string())
} }
pub fn put_client_blocking_read_cxx( pub fn put_client_blocking_read_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<String, String> { ) -> anyhow::Result<String, anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; Ok(RUNTIME.block_on(async {
let response: Option<String> = RUNTIME.block_on(async {
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.get_mut(&holder); let maybe_client = clients.get_mut(&holder);
if let Some(client) = maybe_client { if let Some(client) = maybe_client {
if let Some(data) = client.rx.recv().await { if let Some(data) = client.rx.recv().await {
return Some(data); return Ok(data);
} else { } else {
report_error( bail!("couldn't receive data via client's receiver");
&ERROR_MESSAGES,
"couldn't receive data via client's receiver",
Some("put"),
);
} }
} else { } else {
report_error( bail!(format!("no client detected for {} in blocking read", holder));
&ERROR_MESSAGES,
"no client detected in blocking read",
Some("put"),
);
} }
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("put")); bail!("couldn't access clients");
} }
None })?)
});
check_error(&ERROR_MESSAGES)?;
response.ok_or("response not received properly".to_string())
} }
/** /**
* field index: * field index:
* 1 - holder (utf8 string) * 1 - holder (utf8 string)
* 2 - blob hash (utf8 string) * 2 - blob hash (utf8 string)
* 3 - data chunk (bytes) * 3 - data chunk (bytes)
*/ */
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines
View Options

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

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::put_request; use proto::put_request;
use proto::put_request::Data::*; use proto::put_request::Data::*;
use proto::PutRequest; use proto::PutRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, c_char_pointer_to_string_new, check_error, c_char_pointer_to_string, c_char_pointer_to_string_new, report_error, string_to_c_char_pointer_new,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail; use anyhow::bail;
use crate::RUNTIME; use crate::RUNTIME;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
▲ Show 20 Lines • Show All 168 Lines • ▼ Show 20 Lines if let Ok(mut grpc_client) =
} }
return Err(format!("could not access client for holder {}", holder)); return Err(format!("could not access client for holder {}", holder));
} }
Err("could not successfully connect to the blob server".to_string()) Err("could not successfully connect to the blob server".to_string())
} }
pub fn put_client_blocking_read_cxx( pub fn put_client_blocking_read_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<String, String> { ) -> anyhow::Result<String, anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; Ok(RUNTIME.block_on(async {
let response: Option<String> = RUNTIME.block_on(async {
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.get_mut(&holder); let maybe_client = clients.get_mut(&holder);
if let Some(client) = maybe_client { if let Some(client) = maybe_client {
if let Some(data) = client.rx.recv().await { if let Some(data) = client.rx.recv().await {
return Some(data); return Ok(data);
} else { } else {
report_error( bail!("couldn't receive data via client's receiver");
&ERROR_MESSAGES,
"couldn't receive data via client's receiver",
Some("put"),
);
} }
} else { } else {
report_error( bail!(format!("no client detected for {} in blocking read", holder));
&ERROR_MESSAGES,
"no client detected in blocking read",
Some("put"),
);
} }
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("put")); bail!("couldn't access clients");
} }
None })?)
});
check_error(&ERROR_MESSAGES)?;
response.ok_or("response not received properly".to_string())
} }
/** /**
* field index: * field index:
* 1 - holder (utf8 string) * 1 - holder (utf8 string)
* 2 - blob hash (utf8 string) * 2 - blob hash (utf8 string)
* 3 - data chunk (bytes) * 3 - data chunk (bytes)
*/ */
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines
View Options

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

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::put_request; use proto::put_request;
use proto::put_request::Data::*; use proto::put_request::Data::*;
use proto::PutRequest; use proto::PutRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, c_char_pointer_to_string_new, check_error, c_char_pointer_to_string, c_char_pointer_to_string_new, report_error, string_to_c_char_pointer_new,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail; use anyhow::bail;
use crate::RUNTIME; use crate::RUNTIME;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
▲ Show 20 Lines • Show All 168 Lines • ▼ Show 20 Lines if let Ok(mut grpc_client) =
} }
return Err(format!("could not access client for holder {}", holder)); return Err(format!("could not access client for holder {}", holder));
} }
Err("could not successfully connect to the blob server".to_string()) Err("could not successfully connect to the blob server".to_string())
} }
pub fn put_client_blocking_read_cxx( pub fn put_client_blocking_read_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<String, String> { ) -> anyhow::Result<String, anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; Ok(RUNTIME.block_on(async {
let response: Option<String> = RUNTIME.block_on(async {
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.get_mut(&holder); let maybe_client = clients.get_mut(&holder);
if let Some(client) = maybe_client { if let Some(client) = maybe_client {
if let Some(data) = client.rx.recv().await { if let Some(data) = client.rx.recv().await {
return Some(data); return Ok(data);
} else { } else {
report_error( bail!("couldn't receive data via client's receiver");
&ERROR_MESSAGES,
"couldn't receive data via client's receiver",
Some("put"),
);
} }
} else { } else {
report_error( bail!(format!("no client detected for {} in blocking read", holder));
&ERROR_MESSAGES,
"no client detected in blocking read",
Some("put"),
);
} }
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("put")); bail!("couldn't access clients");
} }
None })?)
});
check_error(&ERROR_MESSAGES)?;
response.ok_or("response not received properly".to_string())
} }
/** /**
* field index: * field index:
* 1 - holder (utf8 string) * 1 - holder (utf8 string)
* 2 - blob hash (utf8 string) * 2 - blob hash (utf8 string)
* 3 - data chunk (bytes) * 3 - data chunk (bytes)
*/ */
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines
View Options

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

Loading...
View Options

native/android/app/src/main/java/app/comm/android/MainActivity.java

Loading...
View Options

native/android/app/src/main/java/app/comm/android/MainApplication.java

Loading...
View Options

native/android/app/src/main/java/app/comm/android/newarchitecture/MainApplicationReactNativeHost.java

Loading...
View Options

native/android/app/src/main/java/app/comm/android/newarchitecture/components/MainComponentsRegistry.java

Loading...
View Options

native/android/app/src/main/java/app/comm/android/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java

Loading...
View Options

native/android/app/src/main/jni/CMakeLists.txt

Loading...
View Options

native/android/app/src/main/jni/MainApplicationModuleProvider.h

Loading...
View Options

native/android/app/src/main/jni/MainApplicationModuleProvider.cpp

Loading...
View Options

native/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h

Loading...
View Options

native/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp

Loading...
View Options

native/android/app/src/main/jni/MainComponentsRegistry.h

Loading...
View Options

native/android/app/src/main/jni/MainComponentsRegistry.cpp

Loading...
View Options

native/android/app/src/main/jni/OnLoad.cpp

Loading...
View Options

native/android/build.gradle

Loading...
View Options

native/android/gradle.properties

Loading...
View Options

native/android/gradle/wrapper/gradle-wrapper.jar

Loading...
View Options

native/android/gradle/wrapper/gradle-wrapper.properties

Loading...
View Options

native/android/gradlew

Loading...
View Options

native/android/settings.gradle

Loading...