From 820bcf258d402f73cbd7696efb9a64e2603c1bf6 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Wed, 15 Jun 2022 11:59:33 +0200
Subject: [PATCH] Fossil Hybrid HR: Request custom menu config on watchface
 initialization

---
 .../assets/fossil_hr/openSourceWatchface.bin  | Bin 7956 -> 8070 bytes
 .../fossil_hr/FossilHRWatchAdapter.java       |  12 ++++++++++++
 external/fossil-hr-watchface                  |   2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/assets/fossil_hr/openSourceWatchface.bin b/app/src/main/assets/fossil_hr/openSourceWatchface.bin
index 6358d3cdfc98afdc90e8f9f699004c3892abd04e..7ab1121c83fa99c64ec3f0d7c0da6c3319d37000 100644
GIT binary patch
delta 2206
zcmZ{mTWl3&5XXPJ=koQmrL+Z#Hm1TUuq}mJi|whklxw@oMbUzVR&M3CAX1<djUcI)
zgjJ(xSs)^ch?hmc&{%Kyf^SQFG{pF%#FtHcAU^1ezL?ps2N2>(HYexIH}n1fGxML>
zW9^6MO<UU4)pHN}Gi4$efc$R5U@8Sb%d+8VXNIh5h^ir&2GMi~W<X$pss(o@cy$oY
z0;?WW14IpAH-a|@>?XKwK&c6i342Vqnt;+2Y)`?rDcD#5Eg3kIfu9RuO%b#dLqi!n
zUPd9;%b=kgM*I$AXK%}N=iwPntK~dW<FwT}b7wm3b<Vt5&ivWVf_i7+1J0rbXYqqh
zN2Aj@$FU!BoF->Uv$HhUF-A2V(@UAAnNHuN(*!}YZ<^IZIj~wl0iJxf!XMRtQe)&2
zwMnxzRm1mQO?vi7vXhjK1V%FH<+M+jKTpo6H52i<atsX8hM6p%5Vb)#7u<HR=7E|I
zp*#y9x*sa+g%B(RYY_yCAY2S?hkw-Ut+YEK=+yq6txa+?a{P3ny+X_qUXHj+AX*|}
z{oX|OE|aw^HXTi5hur00Jqq??5M(q7wF06Qpq>D`3)D*RR)Sj!?kWgZf%PO<1)#dY
z>xQTs?9~vi25Sv49^5q$$Rp=^!0Umi2drLjdm-w@pOgGyQWLmOL9kY;0MS~o*7@bB
zx+bx#hh~h9!Z_Or!!R-#xhz-@Y9rWv;PrvM3A{~UZ}taLjrHDUu(m+71=KchT?n^>
zyF>B`>S^$HLih}*e*eeRfpT#P`Za8|8|>Zw`gGM$9BB{K875adbr&ULFiF5P<pyt$
z=%&WF@;~<I4!dr`gkhNJw8W3=)vXcQd!g1aCpyW5L+YykPr59ImOmp5?7e=Ks;Y_+
zXU2*%R+xO@yuE&}YK%RFqeOQHAR6#btEzgTZ}0mrXr)ORMk1ApK`jS02=<`=yP8>f
zJ5JTFJ4GS}gMNKMRkyoeUt&EA!E<0g58eT=4uX3S!h_(w0PZ23_~_7>VrJc{rPR+F
z(%ldaN%Q$<3l3-P7j<awC7r4K?b3H+2$p6R_2s~RS<fJmZ}19uhqZh~T9KzaA$k>5
z6$Gzo>52HI{j3y(uS4(#Sc(`x_@;CR1V_NC_HSf<s*K)(;BAm}#3h@b7pnhDVRQNI
zW~rDv)1OgPRjGy{9ERYimQC#K3m|`eQAIX9Ch^DaolmSl!DX$>C&NEcbfiMW7{int
z9f#;RxF`J9;_uQD+}h&*UEJ6lo`C#)g3x|PXIeb-Wa9{NJ3vq*L)_mquFF)z{@3GX
zwA&{&T7e>|kaWc<l<_Xwdl#Zp;J&Aaf~*G-Tkt;Er~S&314Ggd5=MOh0!Z+=XY|&P
z5Z;I2o&_}l!jEouhv;LlCf))bCGHd^gk_*iy=|gTz$*ro&~UsGs&SJVqc;iM$q-e7
zdmmW$>UHMTjW&<})JO|JHSGUZ+S(pt4nUoQ8op^V`pga)-cu<yQmUjRJO^?{73#JQ
zKLhXl*xc;#d&>s0;d!twfO`R=3wjhz0j!JQ%CpA5QC5F*>IN4f`W)0H2rq#*a`#k~
z2`ZCQcB)L*Fs%{TgAk2?_r)0dQG|I+(EaijVfB?xK%B7&u{ixx<$tX%ikYRsEGmlI
zLN-BG@9liy<$u}rvfHKk<Q<^Ryxf+!oJ(Cx*3ghsxq@0FGdFcD-By@OU+HA@*9p~T
zX$d>}cMNXWwY7i$hAn-AeWPZ@0b}a@WH;~MH@JIOY{<4w$qsDYyMODx!3~>t_ix+b
LW=9WBKB@i%C;P_~

delta 2018
zcmZXVTWl0%6vuzN+nui$3bciSjajgT&bG*{mKI7cKxt<H39_X{Knpd>sFiZjXl>9E
zFHF1?p`Ri`R5ZvGlql(wyns)W@L)_N#26oZn>XTvCWI$*=Ia8=CY#B8XU;kQ^FQZ*
zzM~x<w=dY3%k7wp`Tbb|2|(UkNbm@SK=XzZ3(k&4)ezJ`v;cyI5Y&Rof>#HAJ%o$E
zUJPm}L`%V04t@hTjqr;EO~T3~98bY-1+Xj)N79g$6h-iS5u7cC`6a+KxIGi*mcc|B
z+%6-@u-=>)%r!4`SJt|#Y_}!ruC8-i>)p0RZu_Hd$6|NQ5_j!Vcil3#bGf^|!R>m?
z?QV3P6|URV1y)>6I+;vb*4+{sAy}cylQpAFU^jyTe0i>dziR#_n`lne6(n2IS+4n6
zYw-^S-IS9cft5%WlvjkSAZP(+HK<mIS|MnIpdF%lV0VDu0cs8SYamz)&N`FFR&X3x
zo0{e7Kay^h-3flD3FxgiAB%I?rQ1{Om135B@`=+8VYlSb<EiQgOv;T-*HhJ_&IV8$
z!QKQxk;xowg79&OHiNwdqAlP(0p3h-wnDHKR1WMyh;rcdK-dHJHVC$X>IG(i(+hqt
z1oB-kczqD|f!Yqvb_lnl2MeyxZUpB^@OKE^5bglAQ*TT!S|OHQ&_trEIBrlXkw_F3
zNiu&IL{EX;4_-gmyTRKH_8xsP-LS;l18M-m0f?Rf=UE7z181*cINA%|^ANlM(Tlp+
z8YveSf6%~=2El$wpR_Vo9BH4vVpWw&FmE5Ul1*IIKUo!)oP_)I9jhvKk9qGgnd~85
zt1|yNmgM%3?o*kJL>0b;*F2|r&b=W$t{P%bfhPf-{SfZgH&w<G<n{r5M^#OiAkx6-
z0N4k0bzyx~d?elPk-AJj#o0fo_ZDXQoI}Q>UIzaauwMo5HBiIg3_~ys-s|9u7<$4H
z6GGIRXIxlThfU9d!!jcJ_rjyq_8TU&_okV@e0G_RDFkm7bq<J<M$H<C)pP{Bw~d-a
z5#c+gU*Wr;GT<MbQq0tl*l7rS@ZTd=hyV!QH?{g7fL*O?i*HtiAA&yyLPy+?w!FY}
zWl2-{{bpgytJD1@nOrmm!7=bZGQ%BvA2)ymi~tq@*Pb@=4NgeHDIjgc!V#cqXPzDX
zbIGwv(NK(ANE?T692~6=O}k=AHZ`CdN*kI24S4_p+5Y5S!hH2{gm@GnD3QggPnYJB
z(U`tfTH9`)H1GwAY!87foXWbDi2kP#o&x7Hqh(pyq7nZz*k^QZ`pBrvhlGjFfB+JF
z&gW*6O9<}^aJ~dp0m0e(-68x6>{<7KN2&ko3Boc^$tg%*gFg*a%E0lbQ-fDvF#5B>
zn*&i5cn^d95HViAesXBW`Gh3^qcL4o)>0f}J_pe`-CtIj3BCb2QpIMhgY)18Mr~2A
z9xppo9R#2zz?pz>!Yr)$fVu#V{Cjn6`I5W4(Z2xUMTowI;5+axJ-GX1&&ht1YfW}w
zXc+|dK?pB__q{1LlIL_&k8}B6ebHr8Z%j}{EKdDv`9E9C+Or^8TpUlq26JuZdn{*i
z)ymZ>b0$}CYx2kDf*YwU%bKlbRhKAiOW#Ph7B#1@c2CZmRg;{|RgNSkZ_PQS{sm_%
Br+WYZ

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
index f997d40f6..f2b76a007 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
@@ -1584,6 +1584,18 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
                             );
                         queueWrite(new JsonPutRequest(responseObject, this));
                     }
+                } else if (request.optString("custom_menu").equals("request_config")) {
+                    // watchface requests custom menu data to be initialized
+                    LOG.info("Got custom_menu config request, sending intent to HR Menu Companion app...");
+                    Intent intent = new Intent();
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    intent.setClassName("d.d.hrmenucompanion", "d.d.hrmenucompanion.MainActivity");
+                    intent.putExtra("SEND_CONFIG", true);
+                    try {
+                        getContext().startActivity(intent);
+                    } catch (Exception e) {
+                        LOG.info("Couldn't send intent to Fossil-HR-Menu-Companion app, is it installed?");
+                    }
                 } else {
                     LOG.warn("Unhandled request from watch: " + requestJson.toString());
                 }
diff --git a/external/fossil-hr-watchface b/external/fossil-hr-watchface
index f07ed376e..6a0c2bdad 160000
--- a/external/fossil-hr-watchface
+++ b/external/fossil-hr-watchface
@@ -1 +1 @@
-Subproject commit f07ed376e9046dbcc9c5d7821117c80b2d79ffd1
+Subproject commit 6a0c2bdad14e58d4cf4359e5f573c60aa89bca53