Fully fixing the app for .NET Native.

woachk · Apr 12, 2017 · 14a59c1 · 14a59c1
1 parent 2fcc66f
commit 14a59c1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/MastodonAPI/ApplicationClass.cs b/MastodonAPI/ApplicationClass.cs
@@ -18,9 +18,9 @@ You should have received a copy of the GNU General Public License
 */
 namespace MastodonAPI
 {
-    class ApplicationClass
+    public class ApplicationClass
     {
-        public string name;
-        public string website;
+        public string name { get; set; }
+        public string website { get; set; }
     }
 }
diff --git a/MastodonAPI/NotificationClass.cs b/MastodonAPI/NotificationClass.cs
@@ -25,7 +25,12 @@ namespace MastodonAPI
 {
     public class NotificationClass_new
     {
-        static public dynamic getNotifications(AuthenticateClass token)
+        public string id { get; set; }
+        public string type { get; set; }
+        public string created_at { get; set; }
+        public AccountClass account { get; set; }
+        public StatusClass_new status { get; set; }
+        static public NotificationClass_new[] getNotifications(AuthenticateClass token)
         {
             List<NotificationClass> notifications = new List<NotificationClass>();
             HttpClient client = new HttpClient();
@@ -34,12 +39,12 @@ static public dynamic getNotifications(AuthenticateClass token)
             message.Wait();
             HttpResponseMessage msg = message.Result;
             String json = (msg.Content).ReadAsStringAsync().Result;
-            dynamic obj = JsonConvert.DeserializeObject<dynamic>(json);
+            NotificationClass_new[] obj = JsonConvert.DeserializeObject<NotificationClass_new[]>(json);
             return obj;
         }
-        static public dynamic parseNotification(string json)
+        static public NotificationClass_new parseNotification(string json)
         {
-            dynamic obj = JsonConvert.DeserializeObject<dynamic>(json);
+            dynamic obj = JsonConvert.DeserializeObject<NotificationClass_new>(json);
             return obj;
         }
     }

diff --git a/MastodonAPI/StatusClass.cs b/MastodonAPI/StatusClass.cs
@@ -42,7 +42,7 @@ public class StatusClass_new
         public string sensitive { get; set; }
         public string spoiler_text { get; set; }
         public string visiblity { get; set; }
-        public string application { get; set; }
+        public ApplicationClass application { get; set; }
         static public StatusClass_new parseToot(string json)
         {
             return JsonConvert.DeserializeObject<StatusClass_new>(json);

diff --git a/MastodonUWA/MainPage.xaml.cs b/MastodonUWA/MainPage.xaml.cs
@@ -221,8 +221,8 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
             }
             else
             {
-                dynamic notifications = NotificationClass_new.getNotifications(token);
-                for (int i = notifications.Count - 1; i >= 0; i--)
+                NotificationClass_new[] notifications = NotificationClass_new.getNotifications(token);
+                for (int i = notifications.Length - 1; i >= 0; i--)
                 {
                     if (notifications[i].id != null)
                     {