Merge branch 'main' of https://github.com/uom-android-team2/WeBall_St…

…atistics # Conflicts: # WeBall-Statistics-Mobile/.idea/deploymentTargetDropDown.xml
georgestefou · Jun 19, 2022 · d2affc7 · d2affc7
2 parents dc8bc83 + 31e3edb
commit d2affc7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...le/app/src/main/java/uom/team2/weball_statistics/UI_Controller/AdminsView/AdminsView.java b/...le/app/src/main/java/uom/team2/weball_statistics/UI_Controller/AdminsView/AdminsView.java
@@ -414,7 +414,7 @@ public void onClick(View view) {
                 if (teamGuest.getKeyPlayers().size() <= 5) {
                     for (int i = 0; i < teamGuest.getKeyPlayers().size(); i++) {
                         Picasso.get()
-                                .load(Config.PLAYER_IMAGES_RESOURCES + teamLandlord.getKeyPlayers().get(i).getImagePath())
+                                .load(Config.PLAYER_IMAGES_RESOURCES + teamGuest.getKeyPlayers().get(i).getImagePath())
                                 .resize(200, 200)
                                 .centerCrop()
                                 .into(playersImageViewList.get(i));

diff --git a/...Statistics-Mobile/app/src/main/java/uom/team2/weball_statistics/configuration/Config.java b/...Statistics-Mobile/app/src/main/java/uom/team2/weball_statistics/configuration/Config.java
@@ -2,7 +2,7 @@
 
 public class Config {
 
-    public static final String IP = "172.26.208.1";
+    public static final String IP = "172.28.80.1";
     public static final String API_URL = "http://" + IP + "/WeBall_Statistics-Backend/API/";
     public static final String MATCHES_API = "http://" + IP + "/weBall_Statistics-Backend/API/match.php";
     public static final String API_REFEREE = "referee.php";

diff --git a/WeBall-Statistics-Mobile/app/src/main/res/xml/network_security_config.xml b/WeBall-Statistics-Mobile/app/src/main/res/xml/network_security_config.xml
@@ -17,6 +17,6 @@
         <domain includeSubdomains="true">10.4.22.16</domain>
         <domain includeSubdomains="true">172.21.80.1</domain>
         <domain includeSubdomains="true">192.168.2.66</domain>
-        <domain includeSubdomains="true">172.26.208.1</domain>
+        <domain includeSubdomains="true">172.28.80.1</domain>
     </domain-config>
 </network-security-config>