From ecf14c5f21f529845eff27439d81db374a03754d Mon Sep 17 00:00:00 2001
From: Joshua <8Joshua@web.de>
Date: Thu, 2 Aug 2018 15:02:52 +0200
Subject: [PATCH] =?UTF-8?q?URLs=20bei=20Ank=C3=BCndigunen=20werden=20jetzt?=
 =?UTF-8?q?=20angezeigt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moddetails/ModDetailAnnounceAdapter.java        |  9 ++++++++-
 .../sebse/fuplanner/services/KVV/KVVModuleList.java | 13 ++++++++++++-
 .../fuplanner/services/KVV/types/Announcement.java  | 12 ++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java
index af98fb6..852bce1 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailAnnounceAdapter.java
@@ -5,6 +5,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
 
+import java.util.ArrayList;
+
 import de.sebse.fuplanner.R;
 import de.sebse.fuplanner.services.KVV.types.Announcement;
 import de.sebse.fuplanner.services.KVV.types.Modules;
@@ -18,7 +20,12 @@ class ModDetailAnnounceAdapter extends BaseExpandableListAdapter {
 
     @Override
     public String getChild(int groupPosition, int childPosititon) {
-        return this.getGroup(groupPosition).getBody();
+        String s= this.getGroup(groupPosition).getBody();
+        ArrayList<String> urls = this.getGroup(groupPosition).getUrls();
+        for (int j =0; j<urls.size(); j++){
+            s += urls.get(j);
+        }
+        return s;
     }
 
     @Override
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
index f4dc2d6..287e02b 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
@@ -225,8 +225,19 @@ class KVVModuleList extends HTTPService {
                     text = new Source(text).getRenderer().toString();
                     String createdBy = site.getString("createdByDisplayName");
                     long createdOn = site.getLong("createdOn");
-                    announcements.add(new Announcement(id, title, text, createdBy, createdOn));
+
+
+
+                    //PDFs links rausziehen
+                    JSONArray attachments = site.getJSONArray("attachments");
+                    ArrayList<String> urls = new ArrayList<>();
+                    for (int j =0; j<attachments.length(); j++){
+                        urls.add(attachments.getJSONObject(j).optString("url",null));
+                    }
+
+                    announcements.add(new Announcement(id, title, text, createdBy, createdOn, urls));
                 }
+
             } catch (JSONException e) {
                 e.printStackTrace();
                 errorCallback.onError(new NetworkError(101202, 403, "Cannot parse announcements!"));
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java
index 961fd31..256bdcf 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java
@@ -1,6 +1,7 @@
 package de.sebse.fuplanner.services.KVV.types;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 
 public class Announcement implements Serializable {
     private final String id;
@@ -8,14 +9,20 @@ public class Announcement implements Serializable {
     private final String body;
     private final String createdBy;
     private final long createdOn;
+    private final ArrayList<String> urls;
 
-    public Announcement(String id, String title, String body, String createdBy, long createdOn) {
+    public Announcement(String id, String title, String body, String createdBy, long createdOn, ArrayList<String> urls) {
 
         this.id = id;
         this.title = title;
         this.body = body;
         this.createdBy = createdBy;
         this.createdOn = createdOn;
+        this.urls = urls;
+    }
+
+    public ArrayList<String> getUrls() {
+        return urls;
     }
 
     public String getId() {
@@ -44,6 +51,7 @@ public class Announcement implements Serializable {
                 "\nTitle: "+getTitle()+
                 "\nBody length: "+getBody().length()+
                 "\nCreated by: "+getCreatedBy()+
-                "\nCreated on: "+getCreatedOn();
+                "\nCreated on: "+getCreatedOn()+
+                "\nURLs: "+getUrls().toString();
     }
 }