From ac071aee758392b8ca4e526be19b4ca1e5061f3e Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 02:36:20 +0200
Subject: [PATCH 01/13] feat: flatpak cleanup & support

---
 ext/flatpak/ipscan                          |  5 ++
 ext/flatpak/org.angryip.ipscan.desktop      | 13 ++++
 ext/flatpak/org.angryip.ipscan.metainfo.xml | 54 ++++++++++++++
 ext/flatpak/org.angryip.ipscan.yaml         | 80 +++++++++++++++++++++
 4 files changed, 152 insertions(+)
 create mode 100644 ext/flatpak/ipscan
 create mode 100644 ext/flatpak/org.angryip.ipscan.desktop
 create mode 100644 ext/flatpak/org.angryip.ipscan.metainfo.xml
 create mode 100644 ext/flatpak/org.angryip.ipscan.yaml

diff --git a/ext/flatpak/ipscan b/ext/flatpak/ipscan
new file mode 100644
index 00000000..4bf81f09
--- /dev/null
+++ b/ext/flatpak/ipscan
@@ -0,0 +1,5 @@
+#!/bin/bash
+java=$JAVA_HOME/bin/java
+[ ! -e "$java" ] && java=java
+
+"$java" --add-opens java.base/java.net=ALL-UNNAMED -jar /app/lib/ipscan/ipscan.jar "$@"
\ No newline at end of file
diff --git a/ext/flatpak/org.angryip.ipscan.desktop b/ext/flatpak/org.angryip.ipscan.desktop
new file mode 100644
index 00000000..904c52bc
--- /dev/null
+++ b/ext/flatpak/org.angryip.ipscan.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.5
+Type=Application
+Name=Angry IP Scanner
+GenericName=Fast and friendly network scanner
+Comment=Fast and friendly network scanner
+Categories=Application;Network;Internet;Utility
+Keywords=angry;ipscan;ip;scan;scanner
+Exec=sh /usr/bin/ipscan
+Terminal=false
+Icon=ipscan
+StartupNotify=true
+StartupWMClass=Angry IP Scanner
\ No newline at end of file
diff --git a/ext/flatpak/org.angryip.ipscan.metainfo.xml b/ext/flatpak/org.angryip.ipscan.metainfo.xml
new file mode 100644
index 00000000..06143e4a
--- /dev/null
+++ b/ext/flatpak/org.angryip.ipscan.metainfo.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>org.angryip.ipscan</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0+</project_license>
+    <name>Angry IP Scanner</name>
+    <developer_name>Anton Keks and contributors</developer_name>
+    <summary>Fast and friendly network scanner</summary>
+    <content_rating type="oars-1.0" />
+    <icon type="remote" width="128" height="128">https://angryip.org/images/icon.png</icon>
+
+    <description>
+        <p>Angry IP Scanner (or simply ipscan) is an open-source and cross-platform network scanner designed to be fast and simple to use. It scans IP addresses and ports, as well as having many other features.</p>
+        <p>It is widely used by network administrators and just curious users around the world, including large and small enterprises, banks, and government agencies.</p>
+    </description>
+
+    <screenshots>
+        <screenshot type="default">
+            <caption>A scan was performed</caption>
+            <image type="source">https://angryip.org/screenshots/ipscan-ubuntu.png</image>
+        </screenshot>
+    </screenshots>
+
+    <categories>
+        <category>Network</category>
+        <category>Utility</category>
+    </categories>
+
+    <keywords>
+      <keyword>angry</keyword>
+      <keyword>ipscan</keyword>
+      <keyword>ip</keyword>
+      <keyword>scan</keyword>
+      <keyword>scanner</keyword>
+    </keywords>
+
+    <url type="homepage">https://angryip.org/</url>
+    <url type="bugtracker">https://github.com/angryip/ipscan/issues/</url>
+    <url type="faq">https://angryip.org/faq/</url>
+    <url type="help">https://angryip.org/documentation/</url>
+    <url type="vcs-browser">https://github.com/angryip/ipscan/</url>
+    <url type="contribute">https://angryip.org/contribute/</url>
+
+    <launchable type="desktop-id">org.angryip.ipscan.desktop</launchable>
+    <requires>
+        <internet>always</internet>
+    </requires>
+
+    <releases>
+        <release version="3.9.1" date="2023-02-11">
+            <url>https://github.com/angryip/ipscan/releases/tag/3.9.1</url>
+        </release>
+    </releases>
+</component>
\ No newline at end of file
diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
new file mode 100644
index 00000000..d7668d70
--- /dev/null
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -0,0 +1,80 @@
+app-id: org.angryip.ipscan
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.openjdk11
+command: ipscan
+finish-args:
+  - --socket=x11
+  - --share=ipc
+  - --share=network
+  - --filesystem=xdg-config/gtk-3.0:ro;
+  - --persist=.swt
+  - --persist=.java
+  - --env=PATH=/usr/bin:/app/bin:/app/jre/bin
+  - --env=JAVA_HOME=/app/jre
+modules:
+  - name: openjdk
+    buildsystem: simple
+    build-commands:
+      - /usr/lib/sdk/openjdk11/install.sh
+
+  - name: ipscan
+    buildsystem: simple
+    build-commands:
+      - install ipscan.jar /app/lib/ipscan/
+      - install ipscan /app/bin/
+      - desktop-file-edit --set-key=Exec --set-value=ipscan
+      - desktop-file-edit --set-key=Icon --set-value=org.angryip.ipscan
+      - install org.angryip.ipscan.desktop /app/share/applications/
+      - install org.angryip.ipscan.metainfo.xml /app/share/metainfo/
+      - install org.angryip.ipscan.svg /app/share/icons/hicolor/scalable/apps/
+      - install org.angryip.ipscan32.png /app/share/icons/hicolor/32x32/apps/org.angryip.ipscan.png/
+      - install org.angryip.ipscan48.png /app/share/icons/hicolor/48x48/apps/org.angryip.ipscan.png/
+      - install org.angryip.ipscan128.png /app/share/icons/hicolor/128x128/apps/org.angryip.ipscan.png/
+      - install org.angryip.ipscan256.png /app/share/icons/hicolor/256x256/apps/org.angryip.ipscan.png/
+
+    sources:
+      - type: file
+        url: https://github.com/angryip/ipscan/releases/download/3.9.1/ipscan-linux64-3.9.1.jar
+        dest-filename: ipscan.jar
+        only-arches: [x86_64]
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/angryip/ipscan/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="ipscan-linux64-" + $version + ".jar") | .browser_download_url
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/ipscan
+        dest-filename: ipscan
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/deb-bundle/usr/share/applications/ipscan.desktop
+        dest-filename: org.angryip.ipscan.desktop
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/org.angryip.ipscan.metainfo.xml
+        # sha256: adf911dfc41ceb0b844c4d4d6c74afa1576670673cb42d3d30b8c3054cc9c15d
+        dest-filename: org.angryip.ipscan.metainfo.xml
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon.svg
+        dest-filename: org.angryip.ipscan.svg
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon32.png
+        dest-filename: org.angryip.ipscan32.png
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon48.png
+        dest-filename: org.angryip.ipscan48.png
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon128.png
+        dest-filename: org.angryip.ipscan128.png
+
+      - type: file
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon256.png
+        dest-filename: org.angryip.ipscan256.png
\ No newline at end of file

From 33eb4461b17f84b39d2c303ee4ba4301187ab57f Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 02:59:01 +0200
Subject: [PATCH 02/13] fix: remove remaining hash field

---
 ext/flatpak/org.angryip.ipscan.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index d7668d70..bb28ff61 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -56,7 +56,6 @@ modules:
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/org.angryip.ipscan.metainfo.xml
-        # sha256: adf911dfc41ceb0b844c4d4d6c74afa1576670673cb42d3d30b8c3054cc9c15d
         dest-filename: org.angryip.ipscan.metainfo.xml
 
       - type: file

From eae0b0675202824b1cc5cc944b4e7e2eaaf57aa2 Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 03:07:50 +0200
Subject: [PATCH 03/13] fix: add hash of jar binary

---
 ext/flatpak/org.angryip.ipscan.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index bb28ff61..6420c440 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -38,6 +38,7 @@ modules:
     sources:
       - type: file
         url: https://github.com/angryip/ipscan/releases/download/3.9.1/ipscan-linux64-3.9.1.jar
+        sha256: b8b12628c324cddb1e1a464c1caf2597b66ce8f5f1057ffa86c1fe7b1c241b40
         dest-filename: ipscan.jar
         only-arches: [x86_64]
         x-checker-data:

From a7fdbddb6433bbb2f161326ea10f559d10ade950 Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 03:17:37 +0200
Subject: [PATCH 04/13] feat: add sha256 sums

---
 ext/flatpak/org.angryip.ipscan.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index 6420c440..9fb21ea8 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -49,14 +49,17 @@ modules:
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/ipscan
+        sha256: afd4831d66797afff99429b4f76bf89a15c372a8e63b65ccbd494a0cb4c88c57
         dest-filename: ipscan
 
       - type: file
-        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/deb-bundle/usr/share/applications/ipscan.desktop
+        url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/org.angryip.ipscan.desktop
+        sha256: 24deb64a221ab5e3e270b1ab36d31a01289092223384065d69b6249144248a54
         dest-filename: org.angryip.ipscan.desktop
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/org.angryip.ipscan.metainfo.xml
+        sha256: fc977de31025e0f270a69ceb389c415444954a848c00a14f661260a6120a94f7
         dest-filename: org.angryip.ipscan.metainfo.xml
 
       - type: file

From e2f921e4a9e181f556c928a0a71d068b484f4826 Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 03:22:51 +0200
Subject: [PATCH 05/13] fix: add icons checksums

---
 ext/flatpak/org.angryip.ipscan.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index 9fb21ea8..cc199c13 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -64,20 +64,25 @@ modules:
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon.svg
+        sha256: 1b2d31740d3d3bbd51d3d9a71d65d3859e38d10e99dd978d32fe86ed1e5d7416
         dest-filename: org.angryip.ipscan.svg
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon32.png
+        sha256: e942b7f71f62d3c0f4dc69631bb0b9b0a6daa25227b7e1679ac6a79999a64a2b
         dest-filename: org.angryip.ipscan32.png
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon48.png
+        sha256: 7ddbd1ce286d2b42f967a27df82568aa03bac42ce3818f1e4f881a285114f3b0
         dest-filename: org.angryip.ipscan48.png
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon128.png
+        sha256: b163b0f6b2c5674dd1a47a995ffde7f46448679e2f91726e84438596cf029f4f
         dest-filename: org.angryip.ipscan128.png
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon256.png
+        sha256: 997f7b13d516f4524d4cd9bb0b816d1a48b5823fe8849a51d57fd1ea6fc1b19d
         dest-filename: org.angryip.ipscan256.png
\ No newline at end of file

From 197d22b0c73676a02d5abf1629c8fdca0129a34a Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:16:43 +0200
Subject: [PATCH 06/13] fix: fix install paths on manifest

---
 ext/flatpak/org.angryip.ipscan.desktop |  4 ++--
 ext/flatpak/org.angryip.ipscan.yaml    | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/ext/flatpak/org.angryip.ipscan.desktop b/ext/flatpak/org.angryip.ipscan.desktop
index 904c52bc..aadb65e7 100644
--- a/ext/flatpak/org.angryip.ipscan.desktop
+++ b/ext/flatpak/org.angryip.ipscan.desktop
@@ -6,8 +6,8 @@ GenericName=Fast and friendly network scanner
 Comment=Fast and friendly network scanner
 Categories=Application;Network;Internet;Utility
 Keywords=angry;ipscan;ip;scan;scanner
-Exec=sh /usr/bin/ipscan
+Exec=sh /app/bin/ipscan
 Terminal=false
-Icon=ipscan
+Icon=org.angryip.ipscan
 StartupNotify=true
 StartupWMClass=Angry IP Scanner
\ No newline at end of file
diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index cc199c13..64ff6e1c 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -23,17 +23,15 @@ modules:
   - name: ipscan
     buildsystem: simple
     build-commands:
-      - install ipscan.jar /app/lib/ipscan/
-      - install ipscan /app/bin/
-      - desktop-file-edit --set-key=Exec --set-value=ipscan
-      - desktop-file-edit --set-key=Icon --set-value=org.angryip.ipscan
-      - install org.angryip.ipscan.desktop /app/share/applications/
-      - install org.angryip.ipscan.metainfo.xml /app/share/metainfo/
-      - install org.angryip.ipscan.svg /app/share/icons/hicolor/scalable/apps/
-      - install org.angryip.ipscan32.png /app/share/icons/hicolor/32x32/apps/org.angryip.ipscan.png/
-      - install org.angryip.ipscan48.png /app/share/icons/hicolor/48x48/apps/org.angryip.ipscan.png/
-      - install org.angryip.ipscan128.png /app/share/icons/hicolor/128x128/apps/org.angryip.ipscan.png/
-      - install org.angryip.ipscan256.png /app/share/icons/hicolor/256x256/apps/org.angryip.ipscan.png/
+      - install -Dm755 ipscan.jar -t /app/lib/ipscan
+      - install -Dm755 ipscan -t /app/bin/ipscan
+      - install -Dm644 org.angryip.ipscan.desktop -t /app/share/applications
+      - install -Dm644 org.angryip.ipscan.metainfo.xml -t /app/share/metainfo
+      - install -Dm644 org.angryip.ipscan.svg -t /app/share/icons/hicolor/scalable/apps
+      - install -Dm644 org.angryip.ipscan32.png /app/share/icons/hicolor/32x32/apps/org.angryip.ipscan.png
+      - install -Dm644 org.angryip.ipscan48.png /app/share/icons/hicolor/48x48/apps/org.angryip.ipscan.png
+      - install -Dm644 org.angryip.ipscan128.png /app/share/icons/hicolor/128x128/apps/org.angryip.ipscan.png
+      - install -Dm644 org.angryip.ipscan256.png /app/share/icons/hicolor/256x256/apps/org.angryip.ipscan.png
 
     sources:
       - type: file

From 398da6171255d85bb7c141f13e237895fe07a78f Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:56:14 +0200
Subject: [PATCH 07/13] fix: final cleanup, now it works!

---
 ext/flatpak/ipscan                          | 2 +-
 ext/flatpak/org.angryip.ipscan.desktop      | 4 ++--
 ext/flatpak/org.angryip.ipscan.metainfo.xml | 2 +-
 ext/flatpak/org.angryip.ipscan.yaml         | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ext/flatpak/ipscan b/ext/flatpak/ipscan
index 4bf81f09..3f80f6b1 100644
--- a/ext/flatpak/ipscan
+++ b/ext/flatpak/ipscan
@@ -2,4 +2,4 @@
 java=$JAVA_HOME/bin/java
 [ ! -e "$java" ] && java=java
 
-"$java" --add-opens java.base/java.net=ALL-UNNAMED -jar /app/lib/ipscan/ipscan.jar "$@"
\ No newline at end of file
+"$java" --add-opens java.base/java.net=ALL-UNNAMED -jar /app/lib/ipscan/ipscan.jar "$@"
diff --git a/ext/flatpak/org.angryip.ipscan.desktop b/ext/flatpak/org.angryip.ipscan.desktop
index aadb65e7..230fba65 100644
--- a/ext/flatpak/org.angryip.ipscan.desktop
+++ b/ext/flatpak/org.angryip.ipscan.desktop
@@ -6,8 +6,8 @@ GenericName=Fast and friendly network scanner
 Comment=Fast and friendly network scanner
 Categories=Application;Network;Internet;Utility
 Keywords=angry;ipscan;ip;scan;scanner
-Exec=sh /app/bin/ipscan
+Exec=ipscan
 Terminal=false
 Icon=org.angryip.ipscan
 StartupNotify=true
-StartupWMClass=Angry IP Scanner
\ No newline at end of file
+StartupWMClass=Angry IP Scanner
diff --git a/ext/flatpak/org.angryip.ipscan.metainfo.xml b/ext/flatpak/org.angryip.ipscan.metainfo.xml
index 06143e4a..4eb21a64 100644
--- a/ext/flatpak/org.angryip.ipscan.metainfo.xml
+++ b/ext/flatpak/org.angryip.ipscan.metainfo.xml
@@ -51,4 +51,4 @@
             <url>https://github.com/angryip/ipscan/releases/tag/3.9.1</url>
         </release>
     </releases>
-</component>
\ No newline at end of file
+</component>
diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index 64ff6e1c..c6d860da 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -6,7 +6,8 @@ sdk-extensions:
   - org.freedesktop.Sdk.Extension.openjdk11
 command: ipscan
 finish-args:
-  - --socket=x11
+  - --socket=wayland
+  - --socket=fallback-x11
   - --share=ipc
   - --share=network
   - --filesystem=xdg-config/gtk-3.0:ro;
@@ -24,7 +25,7 @@ modules:
     buildsystem: simple
     build-commands:
       - install -Dm755 ipscan.jar -t /app/lib/ipscan
-      - install -Dm755 ipscan -t /app/bin/ipscan
+      - install -Dm755 ipscan -t /app/bin
       - install -Dm644 org.angryip.ipscan.desktop -t /app/share/applications
       - install -Dm644 org.angryip.ipscan.metainfo.xml -t /app/share/metainfo
       - install -Dm644 org.angryip.ipscan.svg -t /app/share/icons/hicolor/scalable/apps
@@ -52,7 +53,7 @@ modules:
 
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/ext/flatpak/org.angryip.ipscan.desktop
-        sha256: 24deb64a221ab5e3e270b1ab36d31a01289092223384065d69b6249144248a54
+        sha256: 7e8b9c719fcdaebf7f67938526590fad91018addf1bfc85c830aae888085fc19
         dest-filename: org.angryip.ipscan.desktop
 
       - type: file
@@ -83,4 +84,4 @@ modules:
       - type: file
         url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon256.png
         sha256: 997f7b13d516f4524d4cd9bb0b816d1a48b5823fe8849a51d57fd1ea6fc1b19d
-        dest-filename: org.angryip.ipscan256.png
\ No newline at end of file
+        dest-filename: org.angryip.ipscan256.png

From efdee0b029a8973c80fcac3de2b563b68c805a62 Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 13:32:07 +0200
Subject: [PATCH 08/13] fix: update metainfo

---
 ext/flatpak/org.angryip.ipscan.metainfo.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/flatpak/org.angryip.ipscan.metainfo.xml b/ext/flatpak/org.angryip.ipscan.metainfo.xml
index 4eb21a64..74ee85d8 100644
--- a/ext/flatpak/org.angryip.ipscan.metainfo.xml
+++ b/ext/flatpak/org.angryip.ipscan.metainfo.xml
@@ -4,7 +4,7 @@
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-2.0+</project_license>
     <name>Angry IP Scanner</name>
-    <developer_name>Anton Keks and contributors</developer_name>
+    <developer>Anton Keks and contributors</developer>
     <summary>Fast and friendly network scanner</summary>
     <content_rating type="oars-1.0" />
     <icon type="remote" width="128" height="128">https://angryip.org/images/icon.png</icon>
@@ -17,10 +17,15 @@
     <screenshots>
         <screenshot type="default">
             <caption>A scan was performed</caption>
-            <image type="source">https://angryip.org/screenshots/ipscan-ubuntu.png</image>
+            <image type="source" xml:lang="en">https://angryip.org/screenshots/ipscan-ubuntu.png</image>
         </screenshot>
     </screenshots>
 
+    <branding>
+        <color type="primary" scheme_preference="light">#9cdba6</color>
+        <color type="primary" scheme_preference="dark">#0d7c66</color>
+    </branding>
+
     <categories>
         <category>Network</category>
         <category>Utility</category>

From e815aed321038216991d4ec985b696ab4a017978 Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:45:43 +0200
Subject: [PATCH 09/13] fix: meet flathub requirements

---
 ext/flatpak/org.angryip.ipscan.metainfo.xml |  4 ++--
 ext/flatpak/org.angryip.ipscan.yaml         | 25 ---------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/ext/flatpak/org.angryip.ipscan.metainfo.xml b/ext/flatpak/org.angryip.ipscan.metainfo.xml
index 74ee85d8..3016157c 100644
--- a/ext/flatpak/org.angryip.ipscan.metainfo.xml
+++ b/ext/flatpak/org.angryip.ipscan.metainfo.xml
@@ -6,7 +6,7 @@
     <name>Angry IP Scanner</name>
     <developer>Anton Keks and contributors</developer>
     <summary>Fast and friendly network scanner</summary>
-    <content_rating type="oars-1.0" />
+    <content_rating type="oars-1.1" />
     <icon type="remote" width="128" height="128">https://angryip.org/images/icon.png</icon>
 
     <description>
@@ -17,7 +17,7 @@
     <screenshots>
         <screenshot type="default">
             <caption>A scan was performed</caption>
-            <image type="source" xml:lang="en">https://angryip.org/screenshots/ipscan-ubuntu.png</image>
+            <image type="source">https://angryip.org/screenshots/ipscan-ubuntu.png</image>
         </screenshot>
     </screenshots>
 
diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index c6d860da..80e23269 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -10,7 +10,6 @@ finish-args:
   - --socket=fallback-x11
   - --share=ipc
   - --share=network
-  - --filesystem=xdg-config/gtk-3.0:ro;
   - --persist=.swt
   - --persist=.java
   - --env=PATH=/usr/bin:/app/bin:/app/jre/bin
@@ -29,10 +28,6 @@ modules:
       - install -Dm644 org.angryip.ipscan.desktop -t /app/share/applications
       - install -Dm644 org.angryip.ipscan.metainfo.xml -t /app/share/metainfo
       - install -Dm644 org.angryip.ipscan.svg -t /app/share/icons/hicolor/scalable/apps
-      - install -Dm644 org.angryip.ipscan32.png /app/share/icons/hicolor/32x32/apps/org.angryip.ipscan.png
-      - install -Dm644 org.angryip.ipscan48.png /app/share/icons/hicolor/48x48/apps/org.angryip.ipscan.png
-      - install -Dm644 org.angryip.ipscan128.png /app/share/icons/hicolor/128x128/apps/org.angryip.ipscan.png
-      - install -Dm644 org.angryip.ipscan256.png /app/share/icons/hicolor/256x256/apps/org.angryip.ipscan.png
 
     sources:
       - type: file
@@ -65,23 +60,3 @@ modules:
         url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon.svg
         sha256: 1b2d31740d3d3bbd51d3d9a71d65d3859e38d10e99dd978d32fe86ed1e5d7416
         dest-filename: org.angryip.ipscan.svg
-
-      - type: file
-        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon32.png
-        sha256: e942b7f71f62d3c0f4dc69631bb0b9b0a6daa25227b7e1679ac6a79999a64a2b
-        dest-filename: org.angryip.ipscan32.png
-
-      - type: file
-        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon48.png
-        sha256: 7ddbd1ce286d2b42f967a27df82568aa03bac42ce3818f1e4f881a285114f3b0
-        dest-filename: org.angryip.ipscan48.png
-
-      - type: file
-        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon128.png
-        sha256: b163b0f6b2c5674dd1a47a995ffde7f46448679e2f91726e84438596cf029f4f
-        dest-filename: org.angryip.ipscan128.png
-
-      - type: file
-        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon256.png
-        sha256: 997f7b13d516f4524d4cd9bb0b816d1a48b5823fe8849a51d57fd1ea6fc1b19d
-        dest-filename: org.angryip.ipscan256.png

From e06d3ac88bab0f53d89deb4236a014d0ffad2e46 Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:59:25 +0200
Subject: [PATCH 10/13] fix: change svg link

---
 ext/flatpak/org.angryip.ipscan.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/flatpak/org.angryip.ipscan.yaml b/ext/flatpak/org.angryip.ipscan.yaml
index 80e23269..d617a1a0 100644
--- a/ext/flatpak/org.angryip.ipscan.yaml
+++ b/ext/flatpak/org.angryip.ipscan.yaml
@@ -57,6 +57,6 @@ modules:
         dest-filename: org.angryip.ipscan.metainfo.xml
 
       - type: file
-        url: https://raw.githubusercontent.com/angryip/ipscan/master/resources/images/icon.svg
+        url: https://raw.githubusercontent.com/angryip/ipscan/b6e0b2c82a52298117e514d2f2196e26fa3ac418/resources/images/icon.svg
         sha256: 1b2d31740d3d3bbd51d3d9a71d65d3859e38d10e99dd978d32fe86ed1e5d7416
         dest-filename: org.angryip.ipscan.svg

From b6f9c4b571e1104588025eaf6a3df951b02544a3 Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:15:43 +0200
Subject: [PATCH 11/13] fix: remove icon line from metainfo file

---
 ext/flatpak/org.angryip.ipscan.metainfo.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/flatpak/org.angryip.ipscan.metainfo.xml b/ext/flatpak/org.angryip.ipscan.metainfo.xml
index 3016157c..4ad7d9cb 100644
--- a/ext/flatpak/org.angryip.ipscan.metainfo.xml
+++ b/ext/flatpak/org.angryip.ipscan.metainfo.xml
@@ -7,7 +7,6 @@
     <developer>Anton Keks and contributors</developer>
     <summary>Fast and friendly network scanner</summary>
     <content_rating type="oars-1.1" />
-    <icon type="remote" width="128" height="128">https://angryip.org/images/icon.png</icon>
 
     <description>
         <p>Angry IP Scanner (or simply ipscan) is an open-source and cross-platform network scanner designed to be fast and simple to use. It scans IP addresses and ports, as well as having many other features.</p>

From 27c46f0cc00de11fb4ef9051a19ad40d7be1574e Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:06:13 +0200
Subject: [PATCH 12/13] fix: metainfo developer info

---
 ext/flatpak/org.angryip.ipscan.metainfo.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/flatpak/org.angryip.ipscan.metainfo.xml b/ext/flatpak/org.angryip.ipscan.metainfo.xml
index 4ad7d9cb..85bbb134 100644
--- a/ext/flatpak/org.angryip.ipscan.metainfo.xml
+++ b/ext/flatpak/org.angryip.ipscan.metainfo.xml
@@ -4,7 +4,9 @@
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>GPL-2.0+</project_license>
     <name>Angry IP Scanner</name>
-    <developer>Anton Keks and contributors</developer>
+    <developer id="org.angryip">
+        <name>Anton Keks and contributors</name>
+    </developer>
     <summary>Fast and friendly network scanner</summary>
     <content_rating type="oars-1.1" />
 

From f23f83eacef887003100fc92ac6ea88dcb36af9c Mon Sep 17 00:00:00 2001
From: Ludgie <77110723+ludg1e@users.noreply.github.com>
Date: Wed, 4 Sep 2024 21:18:11 +0200
Subject: [PATCH 13/13] fix: modify desktop file to fix build errors

---
 ext/flatpak/org.angryip.ipscan.desktop | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/flatpak/org.angryip.ipscan.desktop b/ext/flatpak/org.angryip.ipscan.desktop
index 230fba65..a45ebc7c 100644
--- a/ext/flatpak/org.angryip.ipscan.desktop
+++ b/ext/flatpak/org.angryip.ipscan.desktop
@@ -2,9 +2,8 @@
 Version=1.5
 Type=Application
 Name=Angry IP Scanner
-GenericName=Fast and friendly network scanner
 Comment=Fast and friendly network scanner
-Categories=Application;Network;Internet;Utility
+Categories=Application;Network;Utility
 Keywords=angry;ipscan;ip;scan;scanner
 Exec=ipscan
 Terminal=false