Shared streams fix

Author: TaeHagen

src/cloudkit.rs

@@ -278,12 +278,12 @@ pub struct CloudKitState {
 }
 
 impl CloudKitState {
-    pub fn new(dsid: String, delegate: &MobileMeDelegateResponse) -> Self {
-        Self {
+    pub fn new(dsid: String, delegate: &MobileMeDelegateResponse) -> Option<Self> {
+        Some(Self {
             dsid,
-            token: delegate.tokens["cloudKitToken"].clone(),
-            mme_token: delegate.tokens["mmeAuthToken"].clone(),
-        }
+            token: delegate.tokens.get("cloudKitToken")?.clone(),
+            mme_token: delegate.tokens.get("mmeAuthToken")?.clone(),
+        })
     }
 }
 

src/findmy.rs

@@ -40,15 +40,15 @@ pub struct FindMyState {
 }
 
 impl FindMyState {
-    pub fn new(dsid: String, user: String, delegate: &MobileMeDelegateResponse) -> FindMyState {
+    pub fn new(dsid: String, user: String, delegate: &MobileMeDelegateResponse) -> Option<FindMyState> {
         let udid: [u8; 20] = rand::thread_rng().gen();
-        FindMyState {
+        Some(FindMyState {
             dsid,
-            fmf_token: delegate.tokens["mmeFMFAppToken"].clone(),
-            fmip_token: delegate.tokens["mmeFMIPAppToken"].clone(),
+            fmf_token: delegate.tokens.get("mmeFMFAppToken")?.clone(),
+            fmip_token: delegate.tokens.get("mmeFMIPAppToken")?.clone(),
             udid: encode_hex(&udid),
             user
-        }
+        })
     }
 }
 

src/sharedstreams.rs

@@ -26,13 +26,13 @@ pub struct SharedStreamsState {
 }
 
 impl SharedStreamsState {
-    pub fn new(dsid: String, delegate: &MobileMeDelegateResponse) -> SharedStreamsState {
-        SharedStreamsState {
+    pub fn new(dsid: String, delegate: &MobileMeDelegateResponse) -> Option<SharedStreamsState> {
+        Some(SharedStreamsState {
             dsid,
-            mme_authtoken: delegate.tokens["mmeAuthToken"].clone(),
-            host: delegate.config["com.apple.Dataclass.SharedStreams"].as_dictionary().unwrap()["url"].as_string().unwrap().to_string(),
+            mme_authtoken: delegate.tokens.get("mmeAuthToken")?.clone(),
+            host: delegate.config.get("com.apple.Dataclass.SharedStreams")?.as_dictionary().unwrap().get("url")?.as_string().unwrap().to_string(),
             albums: vec![],
-        }
+        })
     }
 }