Fixes

Author: TaeHagen

src/aps.rs

@@ -646,6 +646,13 @@ impl APSConnectionResource {
     }
 
     pub async fn send(&self, message: APSMessage) -> Result<(), PushError> {
+        info!("Attempting to send");
+        // during init can be none
+        let manager_lock = self.manager.lock().await;
+        if let Some(manager_lock) = &*manager_lock {
+            manager_lock.upgrade().unwrap().ensure_not_failed()?;
+        }
+        drop(manager_lock);
         let mut raw = message.to_raw();
         for message in &mut raw.body {
             message.update()?;

src/error.rs

@@ -37,7 +37,7 @@ pub enum PushError {
     KeyNotFound(String),
     #[error("Could not deliver message. The recipient does not have iMessage or you are being rate-limited. Rate limits can start at 0 users for brand new accounts. The only way to resolve a rate limit is patience, trying to reconfigure or re-install to 'fix' the rate limit will result in being temporarily blocked from iMessage.")]
     NoValidTargets,
-    #[error("Failed to connect to APS {0}")]
+    #[error("Aps connection failed. You need to re-setup your device. Go to Settings -> Change Apple Hardware. For self-hosted users, have your hardware code ready. ({0})")]
     APSConnectError(u8),
     #[error("TLS error {0}")]
     TLSError(#[from] rustls::Error),
@@ -62,7 +62,7 @@ pub enum PushError {
     MMCSGetFailed(Option<String>),
     #[error("Failed to authenticate. Try logging in to account.apple.com to fix your Apple Account or create a new one: {1:?} {0}")]
     MobileMeError(String, Option<String>),
-    #[error("You need to add a trusted phone number to your Apple Account at account.apple.com. You may be unable to add your phone number. You can also create a new account at account.apple.com. If you get 'Your account cannot be created at this time,' you need to contact Apple Support. For assistance, join our Discord from our website.")]
+    #[error("You need to add a trusted phone number to your Apple Account at account.apple.com. You may be unable to add your phone number. You can also create a new account at account.apple.com. If you get 'Your account cannot be created at this time,' you need to contact Apple Support. Do not mention OpenBubbles. For assistance, join our Discord from our website.")]
     UnauthorizedAccountError,
     #[error("Bad auth cert {0}")]
     AuthInvalid(IDSError),

src/util.rs

@@ -242,6 +242,7 @@ pub static REQWEST: LazyLock<Client> = LazyLock::new(|| {
 });
 
 pub static CARRIER_REQWEST: LazyLock<Client> = LazyLock::new(|| {
+    // return build_proxy();
     let mut headers = HeaderMap::new();
     headers.insert("Accept-Language", HeaderValue::from_static("en-US,en;q=0.9"));
 
@@ -1066,6 +1067,11 @@ impl<T: Resource + 'static> ResourceManager<T> {
     pub async fn ensure_ready(&self) -> Result<(), PushError> {
         // wait for any generation to finish
         self.resource_state.subscribe().wait_for(|i| !matches!(i, ResourceState::Generating)).await.map_err(|_| PushError::ResourceClosed)?;
+        self.ensure_not_failed()
+    }
+
+    pub fn ensure_not_failed(&self) -> Result<(), PushError> {
+        info!("Ensuring not failed");
         match &*self.resource_state.borrow() {
             ResourceState::Failed(error) => Err(error.clone().into()),
             ResourceState::Closed => Err(PushError::ResourceClosed),