Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
8154cd24bb
|
|||
| 06bfb02ccc | |||
| f82560bb1d | |||
|
a6508da413
|
|||
|
50b30442e8
|
|||
|
b365b967b2
|
|||
|
cacd178817
|
674
LICENSE
Normal file
674
LICENSE
Normal file
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
Ascently is a FOSS app meant to help climbers track their sessions, routes/problems, and overall progress.
|
||||||
|
Copyright (C) 2025 Atridad Lahiji
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
Ascently Copyright (C) 2025 Atridad Lahiji
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@@ -16,8 +16,8 @@ android {
|
|||||||
applicationId = "com.atridad.ascently"
|
applicationId = "com.atridad.ascently"
|
||||||
minSdk = 31
|
minSdk = 31
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 47
|
versionCode = 48
|
||||||
versionName = "2.3.1"
|
versionName = "2.4.0"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,741 @@
|
|||||||
|
package com.atridad.ascently.data.sync
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.SharedPreferences
|
||||||
|
import android.net.ConnectivityManager
|
||||||
|
import android.net.NetworkCapabilities
|
||||||
|
import androidx.annotation.RequiresPermission
|
||||||
|
import androidx.core.content.edit
|
||||||
|
import com.atridad.ascently.data.format.BackupAttempt
|
||||||
|
import com.atridad.ascently.data.format.BackupClimbSession
|
||||||
|
import com.atridad.ascently.data.format.BackupGym
|
||||||
|
import com.atridad.ascently.data.format.BackupProblem
|
||||||
|
import com.atridad.ascently.data.format.ClimbDataBackup
|
||||||
|
import com.atridad.ascently.data.repository.ClimbRepository
|
||||||
|
import com.atridad.ascently.data.state.DataStateManager
|
||||||
|
import com.atridad.ascently.utils.AppLogger
|
||||||
|
import com.atridad.ascently.utils.DateFormatUtils
|
||||||
|
import com.atridad.ascently.utils.ImageNamingUtils
|
||||||
|
import com.atridad.ascently.utils.ImageUtils
|
||||||
|
import java.io.IOException
|
||||||
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Date
|
||||||
|
import java.util.Locale
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
import kotlinx.coroutines.CancellationException
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import kotlinx.coroutines.flow.asStateFlow
|
||||||
|
import kotlinx.coroutines.flow.first
|
||||||
|
import kotlinx.coroutines.withContext
|
||||||
|
import kotlinx.serialization.json.Json
|
||||||
|
import okhttp3.MediaType.Companion.toMediaType
|
||||||
|
import okhttp3.OkHttpClient
|
||||||
|
import okhttp3.Request
|
||||||
|
import okhttp3.RequestBody.Companion.toRequestBody
|
||||||
|
|
||||||
|
class AscentlySyncProvider(
|
||||||
|
private val context: Context,
|
||||||
|
private val repository: ClimbRepository
|
||||||
|
) : SyncProvider {
|
||||||
|
|
||||||
|
override val type: SyncProviderType = SyncProviderType.SERVER
|
||||||
|
|
||||||
|
private val dataStateManager = DataStateManager(context)
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val TAG = "AscentlySyncProvider"
|
||||||
|
}
|
||||||
|
|
||||||
|
private val sharedPreferences: SharedPreferences =
|
||||||
|
context.getSharedPreferences("sync_preferences", Context.MODE_PRIVATE)
|
||||||
|
|
||||||
|
private val httpClient =
|
||||||
|
OkHttpClient.Builder()
|
||||||
|
.connectTimeout(45, TimeUnit.SECONDS)
|
||||||
|
.readTimeout(90, TimeUnit.SECONDS)
|
||||||
|
.writeTimeout(90, TimeUnit.SECONDS)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
private val json = Json {
|
||||||
|
prettyPrint = true
|
||||||
|
ignoreUnknownKeys = true
|
||||||
|
explicitNulls = false
|
||||||
|
coerceInputValues = true
|
||||||
|
}
|
||||||
|
|
||||||
|
private val _isConnected = MutableStateFlow(false)
|
||||||
|
override val isConnected: StateFlow<Boolean> = _isConnected.asStateFlow()
|
||||||
|
|
||||||
|
private val _isConfigured = MutableStateFlow(false)
|
||||||
|
override val isConfigured: StateFlow<Boolean> = _isConfigured.asStateFlow()
|
||||||
|
|
||||||
|
private var isOfflineMode = false
|
||||||
|
|
||||||
|
private object Keys {
|
||||||
|
const val SERVER_URL = "server_url"
|
||||||
|
const val AUTH_TOKEN = "auth_token"
|
||||||
|
const val IS_CONNECTED = "is_connected"
|
||||||
|
const val LAST_SYNC_TIME = "last_sync_time"
|
||||||
|
const val OFFLINE_MODE = "offline_mode"
|
||||||
|
}
|
||||||
|
|
||||||
|
init {
|
||||||
|
loadInitialState()
|
||||||
|
updateConfiguredState()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun loadInitialState() {
|
||||||
|
_isConnected.value = sharedPreferences.getBoolean(Keys.IS_CONNECTED, false)
|
||||||
|
isOfflineMode = sharedPreferences.getBoolean(Keys.OFFLINE_MODE, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun updateConfiguredState() {
|
||||||
|
_isConfigured.value = serverUrl.isNotBlank() && authToken.isNotBlank()
|
||||||
|
}
|
||||||
|
|
||||||
|
var serverUrl: String
|
||||||
|
get() = sharedPreferences.getString(Keys.SERVER_URL, "") ?: ""
|
||||||
|
set(value) {
|
||||||
|
sharedPreferences.edit { putString(Keys.SERVER_URL, value) }
|
||||||
|
updateConfiguredState()
|
||||||
|
_isConnected.value = false
|
||||||
|
sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, false) }
|
||||||
|
}
|
||||||
|
|
||||||
|
var authToken: String
|
||||||
|
get() = sharedPreferences.getString(Keys.AUTH_TOKEN, "") ?: ""
|
||||||
|
set(value) {
|
||||||
|
sharedPreferences.edit { putString(Keys.AUTH_TOKEN, value) }
|
||||||
|
updateConfiguredState()
|
||||||
|
_isConnected.value = false
|
||||||
|
sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, false) }
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
|
||||||
|
private fun isNetworkAvailable(): Boolean {
|
||||||
|
val connectivityManager =
|
||||||
|
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
||||||
|
val network = connectivityManager.activeNetwork ?: return false
|
||||||
|
val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
|
||||||
|
return when {
|
||||||
|
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
|
||||||
|
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
|
||||||
|
else -> false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
|
||||||
|
override suspend fun sync() {
|
||||||
|
if (isOfflineMode) {
|
||||||
|
AppLogger.d(TAG) { "Sync skipped: Offline mode is enabled." }
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (!isNetworkAvailable()) {
|
||||||
|
AppLogger.d(TAG) { "Sync skipped: No internet connection." }
|
||||||
|
throw SyncException.NetworkError("No internet connection.")
|
||||||
|
}
|
||||||
|
if (!_isConfigured.value) {
|
||||||
|
throw SyncException.NotConfigured
|
||||||
|
}
|
||||||
|
if (!_isConnected.value) {
|
||||||
|
throw SyncException.NotConnected
|
||||||
|
}
|
||||||
|
|
||||||
|
val localBackup = createBackupFromRepository()
|
||||||
|
val serverBackup = downloadData()
|
||||||
|
|
||||||
|
val hasLocalData =
|
||||||
|
localBackup.gyms.isNotEmpty() ||
|
||||||
|
localBackup.problems.isNotEmpty() ||
|
||||||
|
localBackup.sessions.isNotEmpty() ||
|
||||||
|
localBackup.attempts.isNotEmpty()
|
||||||
|
|
||||||
|
val hasServerData =
|
||||||
|
serverBackup.gyms.isNotEmpty() ||
|
||||||
|
serverBackup.problems.isNotEmpty() ||
|
||||||
|
serverBackup.sessions.isNotEmpty() ||
|
||||||
|
serverBackup.attempts.isNotEmpty()
|
||||||
|
|
||||||
|
val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
|
||||||
|
if (hasLocalData && hasServerData && lastSyncTimeStr != null) {
|
||||||
|
AppLogger.d(TAG) { "Using delta sync for incremental updates" }
|
||||||
|
performDeltaSync(lastSyncTimeStr)
|
||||||
|
} else {
|
||||||
|
when {
|
||||||
|
!hasLocalData && hasServerData -> {
|
||||||
|
AppLogger.d(TAG) { "No local data found, performing full restore from server" }
|
||||||
|
val imagePathMapping = syncImagesFromServer(serverBackup)
|
||||||
|
importBackupToRepository(serverBackup, imagePathMapping)
|
||||||
|
AppLogger.d(TAG) { "Full restore completed" }
|
||||||
|
}
|
||||||
|
|
||||||
|
hasLocalData && !hasServerData -> {
|
||||||
|
AppLogger.d(TAG) { "No server data found, uploading local data to server" }
|
||||||
|
uploadData(localBackup)
|
||||||
|
syncImagesForBackup(localBackup)
|
||||||
|
AppLogger.d(TAG) { "Initial upload completed" }
|
||||||
|
}
|
||||||
|
|
||||||
|
hasLocalData && hasServerData -> {
|
||||||
|
AppLogger.d(TAG) { "Both local and server data exist, merging (server wins)" }
|
||||||
|
mergeDataSafely(serverBackup)
|
||||||
|
AppLogger.d(TAG) { "Merge completed" }
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
AppLogger.d(TAG) { "No data to sync" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val now = DateFormatUtils.nowISO8601()
|
||||||
|
sharedPreferences.edit { putString(Keys.LAST_SYNC_TIME, now) }
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun disconnect() {
|
||||||
|
serverUrl = ""
|
||||||
|
authToken = ""
|
||||||
|
_isConnected.value = false
|
||||||
|
sharedPreferences.edit {
|
||||||
|
remove(Keys.LAST_SYNC_TIME)
|
||||||
|
putBoolean(Keys.IS_CONNECTED, false)
|
||||||
|
}
|
||||||
|
updateConfiguredState()
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun performDeltaSync(lastSyncTimeStr: String) {
|
||||||
|
AppLogger.d(TAG) { "Starting delta sync with lastSyncTime=$lastSyncTimeStr" }
|
||||||
|
|
||||||
|
val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Date(0)
|
||||||
|
|
||||||
|
val allGyms = repository.getAllGyms().first()
|
||||||
|
val modifiedGyms =
|
||||||
|
allGyms
|
||||||
|
.filter { gym -> parseISO8601(gym.updatedAt)?.after(lastSyncDate) == true }
|
||||||
|
.map { BackupGym.fromGym(it) }
|
||||||
|
|
||||||
|
val allProblems = repository.getAllProblems().first()
|
||||||
|
val modifiedProblems =
|
||||||
|
allProblems
|
||||||
|
.filter { problem ->
|
||||||
|
parseISO8601(problem.updatedAt)?.after(lastSyncDate) == true
|
||||||
|
}
|
||||||
|
.map { problem ->
|
||||||
|
val backupProblem = BackupProblem.fromProblem(problem)
|
||||||
|
val normalizedImagePaths =
|
||||||
|
problem.imagePaths.mapIndexed { index, _ ->
|
||||||
|
ImageNamingUtils.generateImageFilename(problem.id, index)
|
||||||
|
}
|
||||||
|
if (normalizedImagePaths.isNotEmpty()) {
|
||||||
|
backupProblem.copy(imagePaths = normalizedImagePaths)
|
||||||
|
} else {
|
||||||
|
backupProblem
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val allSessions = repository.getAllSessions().first()
|
||||||
|
val modifiedSessions =
|
||||||
|
allSessions
|
||||||
|
.filter { session ->
|
||||||
|
parseISO8601(session.updatedAt)?.after(lastSyncDate) == true
|
||||||
|
}
|
||||||
|
.map { BackupClimbSession.fromClimbSession(it) }
|
||||||
|
|
||||||
|
val allAttempts = repository.getAllAttempts().first()
|
||||||
|
val modifiedAttempts =
|
||||||
|
allAttempts
|
||||||
|
.filter { attempt ->
|
||||||
|
parseISO8601(attempt.createdAt)?.after(lastSyncDate) == true
|
||||||
|
}
|
||||||
|
.map { BackupAttempt.fromAttempt(it) }
|
||||||
|
|
||||||
|
val allDeletions = repository.getDeletedItems()
|
||||||
|
val modifiedDeletions =
|
||||||
|
allDeletions.filter { item ->
|
||||||
|
parseISO8601(item.deletedAt)?.after(lastSyncDate) == true
|
||||||
|
}
|
||||||
|
|
||||||
|
AppLogger.d(TAG) {
|
||||||
|
"Delta sync sending: gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}, deletions=${modifiedDeletions.size}"
|
||||||
|
}
|
||||||
|
|
||||||
|
val deltaRequest =
|
||||||
|
DeltaSyncRequest(
|
||||||
|
lastSyncTime = lastSyncTimeStr,
|
||||||
|
gyms = modifiedGyms,
|
||||||
|
problems = modifiedProblems,
|
||||||
|
sessions = modifiedSessions,
|
||||||
|
attempts = modifiedAttempts,
|
||||||
|
deletedItems = modifiedDeletions
|
||||||
|
)
|
||||||
|
|
||||||
|
val requestBody =
|
||||||
|
json.encodeToString(DeltaSyncRequest.serializer(), deltaRequest)
|
||||||
|
.toRequestBody("application/json".toMediaType())
|
||||||
|
|
||||||
|
val request =
|
||||||
|
Request.Builder()
|
||||||
|
.url("$serverUrl/sync/delta")
|
||||||
|
.header("Authorization", "Bearer $authToken")
|
||||||
|
.post(requestBody)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val deltaResponse =
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
try {
|
||||||
|
httpClient.newCall(request).execute().use { response ->
|
||||||
|
if (response.isSuccessful) {
|
||||||
|
val body = response.body?.string()
|
||||||
|
if (!body.isNullOrEmpty()) {
|
||||||
|
json.decodeFromString(DeltaSyncResponse.serializer(), body)
|
||||||
|
} else {
|
||||||
|
throw SyncException.InvalidResponse("Empty response body")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
handleHttpError(response.code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: IOException) {
|
||||||
|
throw SyncException.NetworkError(e.message ?: "Network error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AppLogger.d(TAG) {
|
||||||
|
"Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}"
|
||||||
|
}
|
||||||
|
|
||||||
|
applyDeltaResponse(deltaResponse)
|
||||||
|
syncModifiedImages(modifiedProblems)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun parseISO8601(dateString: String): Date? {
|
||||||
|
return try {
|
||||||
|
val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)
|
||||||
|
format.parse(dateString)
|
||||||
|
} catch (_: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun applyDeltaResponse(response: DeltaSyncResponse) {
|
||||||
|
// SyncService handles the "isSyncing" state to prevent recursive sync triggers
|
||||||
|
// when the repository is modified during a sync operation.
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Merge and apply deletions first to prevent resurrection
|
||||||
|
val allDeletions = repository.getDeletedItems() + response.deletedItems
|
||||||
|
val uniqueDeletions = allDeletions.distinctBy { "${it.type}:${it.id}" }
|
||||||
|
|
||||||
|
AppLogger.d(TAG) { "Applying ${uniqueDeletions.size} deletion records before merging data" }
|
||||||
|
applyDeletions(uniqueDeletions)
|
||||||
|
|
||||||
|
// Build deleted item lookup set
|
||||||
|
val deletedItemSet = uniqueDeletions.map { "${it.type}:${it.id}" }.toSet()
|
||||||
|
|
||||||
|
// Download images for new/modified problems from server
|
||||||
|
val imagePathMapping = mutableMapOf<String, String>()
|
||||||
|
for (problem in response.problems) {
|
||||||
|
if (deletedItemSet.contains("problem:${problem.id}")) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
problem.imagePaths?.forEach { imagePath ->
|
||||||
|
val serverFilename = imagePath.substringAfterLast('/')
|
||||||
|
try {
|
||||||
|
val localImagePath = downloadImage(serverFilename)
|
||||||
|
if (localImagePath != null) {
|
||||||
|
imagePathMapping[imagePath] = localImagePath
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merge gyms
|
||||||
|
val existingGyms = repository.getAllGyms().first()
|
||||||
|
for (backupGym in response.gyms) {
|
||||||
|
if (deletedItemSet.contains("gym:${backupGym.id}")) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val existing = existingGyms.find { it.id == backupGym.id }
|
||||||
|
if (existing == null || backupGym.updatedAt >= existing.updatedAt) {
|
||||||
|
val gym = backupGym.toGym()
|
||||||
|
if (existing != null) {
|
||||||
|
repository.updateGym(gym)
|
||||||
|
} else {
|
||||||
|
repository.insertGym(gym)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merge problems
|
||||||
|
val existingProblems = repository.getAllProblems().first()
|
||||||
|
for (backupProblem in response.problems) {
|
||||||
|
if (deletedItemSet.contains("problem:${backupProblem.id}")) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val updatedImagePaths =
|
||||||
|
backupProblem.imagePaths?.map { oldPath ->
|
||||||
|
imagePathMapping[oldPath] ?: oldPath
|
||||||
|
}
|
||||||
|
val problemToMerge = backupProblem.copy(imagePaths = updatedImagePaths)
|
||||||
|
val problem = problemToMerge.toProblem()
|
||||||
|
|
||||||
|
val existing = existingProblems.find { it.id == backupProblem.id }
|
||||||
|
if (existing == null || backupProblem.updatedAt >= existing.updatedAt) {
|
||||||
|
if (existing != null) {
|
||||||
|
repository.updateProblem(problem)
|
||||||
|
} else {
|
||||||
|
repository.insertProblem(problem)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merge sessions
|
||||||
|
val existingSessions = repository.getAllSessions().first()
|
||||||
|
for (backupSession in response.sessions) {
|
||||||
|
if (deletedItemSet.contains("session:${backupSession.id}")) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val session = backupSession.toClimbSession()
|
||||||
|
val existing = existingSessions.find { it.id == backupSession.id }
|
||||||
|
if (existing == null || backupSession.updatedAt >= existing.updatedAt) {
|
||||||
|
if (existing != null) {
|
||||||
|
repository.updateSession(session)
|
||||||
|
} else {
|
||||||
|
repository.insertSession(session)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merge attempts
|
||||||
|
val existingAttempts = repository.getAllAttempts().first()
|
||||||
|
for (backupAttempt in response.attempts) {
|
||||||
|
if (deletedItemSet.contains("attempt:${backupAttempt.id}")) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val attempt = backupAttempt.toAttempt()
|
||||||
|
val existing = existingAttempts.find { it.id == backupAttempt.id }
|
||||||
|
if (existing == null || backupAttempt.createdAt >= existing.createdAt) {
|
||||||
|
if (existing != null) {
|
||||||
|
repository.updateAttempt(attempt)
|
||||||
|
} else {
|
||||||
|
repository.insertAttempt(attempt)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply deletions again for safety
|
||||||
|
applyDeletions(uniqueDeletions)
|
||||||
|
|
||||||
|
// Update deletion records
|
||||||
|
repository.clearDeletedItems()
|
||||||
|
uniqueDeletions.forEach { repository.trackDeletion(it.id, it.type) }
|
||||||
|
} catch (e: Exception) {
|
||||||
|
AppLogger.e(TAG, e) { "Error applying delta response" }
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun applyDeletions(
|
||||||
|
deletions: List<com.atridad.ascently.data.format.DeletedItem>
|
||||||
|
) {
|
||||||
|
val existingGyms = repository.getAllGyms().first()
|
||||||
|
val existingProblems = repository.getAllProblems().first()
|
||||||
|
val existingSessions = repository.getAllSessions().first()
|
||||||
|
val existingAttempts = repository.getAllAttempts().first()
|
||||||
|
|
||||||
|
for (item in deletions) {
|
||||||
|
when (item.type) {
|
||||||
|
"gym" -> {
|
||||||
|
existingGyms.find { it.id == item.id }?.let { repository.deleteGym(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
"problem" -> {
|
||||||
|
existingProblems.find { it.id == item.id }?.let { repository.deleteProblem(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
"session" -> {
|
||||||
|
existingSessions.find { it.id == item.id }?.let { repository.deleteSession(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
"attempt" -> {
|
||||||
|
existingAttempts.find { it.id == item.id }?.let { repository.deleteAttempt(it) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) {
|
||||||
|
if (modifiedProblems.isEmpty()) return
|
||||||
|
|
||||||
|
AppLogger.d(TAG) { "Syncing images for ${modifiedProblems.size} modified problems" }
|
||||||
|
|
||||||
|
for (backupProblem in modifiedProblems) {
|
||||||
|
backupProblem.imagePaths?.forEach { imagePath ->
|
||||||
|
val filename = imagePath.substringAfterLast('/')
|
||||||
|
uploadImage(imagePath, filename)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun downloadData(): ClimbDataBackup {
|
||||||
|
val request =
|
||||||
|
Request.Builder()
|
||||||
|
.url("$serverUrl/sync")
|
||||||
|
.header("Authorization", "Bearer $authToken")
|
||||||
|
.get()
|
||||||
|
.build()
|
||||||
|
|
||||||
|
return withContext(Dispatchers.IO) {
|
||||||
|
try {
|
||||||
|
httpClient.newCall(request).execute().use { response ->
|
||||||
|
if (response.isSuccessful) {
|
||||||
|
val body = response.body?.string()
|
||||||
|
if (!body.isNullOrEmpty()) {
|
||||||
|
json.decodeFromString(body)
|
||||||
|
} else {
|
||||||
|
ClimbDataBackup(
|
||||||
|
exportedAt = DateFormatUtils.nowISO8601(),
|
||||||
|
gyms = emptyList(),
|
||||||
|
problems = emptyList(),
|
||||||
|
sessions = emptyList(),
|
||||||
|
attempts = emptyList()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
handleHttpError(response.code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: IOException) {
|
||||||
|
throw SyncException.NetworkError(e.message ?: "Network error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun uploadData(backup: ClimbDataBackup) {
|
||||||
|
val requestBody =
|
||||||
|
json.encodeToString(backup).toRequestBody("application/json".toMediaType())
|
||||||
|
|
||||||
|
val request =
|
||||||
|
Request.Builder()
|
||||||
|
.url("$serverUrl/sync")
|
||||||
|
.header("Authorization", "Bearer $authToken")
|
||||||
|
.put(requestBody)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
try {
|
||||||
|
httpClient.newCall(request).execute().use { response ->
|
||||||
|
if (!response.isSuccessful) {
|
||||||
|
handleHttpError(response.code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: IOException) {
|
||||||
|
throw SyncException.NetworkError(e.message ?: "Network error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> {
|
||||||
|
val imagePathMapping = mutableMapOf<String, String>()
|
||||||
|
val totalImages = backup.problems.sumOf { it.imagePaths?.size ?: 0 }
|
||||||
|
AppLogger.d(TAG) { "Starting image download from server for $totalImages images" }
|
||||||
|
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
backup.problems.forEach { problem ->
|
||||||
|
problem.imagePaths?.forEach { imagePath ->
|
||||||
|
val serverFilename = imagePath.substringAfterLast('/')
|
||||||
|
try {
|
||||||
|
val localImagePath = downloadImage(serverFilename)
|
||||||
|
if (localImagePath != null) {
|
||||||
|
imagePathMapping[imagePath] = localImagePath
|
||||||
|
}
|
||||||
|
} catch (_: SyncException.ImageNotFound) {
|
||||||
|
AppLogger.w(TAG) { "Image not found on server: $imagePath" }
|
||||||
|
} catch (e: CancellationException) {
|
||||||
|
throw e
|
||||||
|
} catch (e: Exception) {
|
||||||
|
AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return imagePathMapping
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun downloadImage(serverFilename: String): String? {
|
||||||
|
val request =
|
||||||
|
Request.Builder()
|
||||||
|
.url("$serverUrl/images/download?filename=$serverFilename")
|
||||||
|
.header("Authorization", "Bearer $authToken")
|
||||||
|
.build()
|
||||||
|
|
||||||
|
return withContext(Dispatchers.IO) {
|
||||||
|
try {
|
||||||
|
httpClient.newCall(request).execute().use { response ->
|
||||||
|
if (response.isSuccessful) {
|
||||||
|
response.body?.bytes()?.let {
|
||||||
|
ImageUtils.saveImageFromBytesWithFilename(context, it, serverFilename)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (response.code == 404) throw SyncException.ImageNotFound
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: IOException) {
|
||||||
|
AppLogger.e(TAG, e) { "Network error downloading image $serverFilename" }
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun syncImagesForBackup(backup: ClimbDataBackup) {
|
||||||
|
AppLogger.d(TAG) { "Starting image sync for backup with ${backup.problems.size} problems" }
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
backup.problems.forEach { problem ->
|
||||||
|
problem.imagePaths?.forEach { localPath ->
|
||||||
|
val filename = localPath.substringAfterLast('/')
|
||||||
|
uploadImage(localPath, filename)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun uploadImage(localPath: String, filename: String) {
|
||||||
|
val file = ImageUtils.getImageFile(context, localPath)
|
||||||
|
if (!file.exists()) {
|
||||||
|
AppLogger.w(TAG) { "Local image file not found, cannot upload: $localPath" }
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val requestBody = file.readBytes().toRequestBody("application/octet-stream".toMediaType())
|
||||||
|
|
||||||
|
val request =
|
||||||
|
Request.Builder()
|
||||||
|
.url("$serverUrl/images/upload?filename=$filename")
|
||||||
|
.header("Authorization", "Bearer $authToken")
|
||||||
|
.post(requestBody)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
try {
|
||||||
|
httpClient.newCall(request).execute().use { response ->
|
||||||
|
if (response.isSuccessful) {
|
||||||
|
AppLogger.d(TAG) { "Successfully uploaded image: $filename" }
|
||||||
|
} else {
|
||||||
|
AppLogger.w(TAG) {
|
||||||
|
"Failed to upload image $filename. Server responded with ${response.code}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: IOException) {
|
||||||
|
AppLogger.e(TAG, e) { "Network error uploading image $filename" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun createBackupFromRepository(): ClimbDataBackup {
|
||||||
|
return withContext(Dispatchers.Default) {
|
||||||
|
ClimbDataBackup(
|
||||||
|
exportedAt = dataStateManager.getLastModified(),
|
||||||
|
gyms = repository.getAllGyms().first().map { BackupGym.fromGym(it) },
|
||||||
|
problems =
|
||||||
|
repository.getAllProblems().first().map { problem ->
|
||||||
|
val backupProblem = BackupProblem.fromProblem(problem)
|
||||||
|
val normalizedImagePaths =
|
||||||
|
problem.imagePaths.mapIndexed { index, _ ->
|
||||||
|
ImageNamingUtils.generateImageFilename(
|
||||||
|
problem.id,
|
||||||
|
index
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (normalizedImagePaths.isNotEmpty()) {
|
||||||
|
backupProblem.copy(imagePaths = normalizedImagePaths)
|
||||||
|
} else {
|
||||||
|
backupProblem
|
||||||
|
}
|
||||||
|
},
|
||||||
|
sessions =
|
||||||
|
repository.getAllSessions().first().map {
|
||||||
|
BackupClimbSession.fromClimbSession(it)
|
||||||
|
},
|
||||||
|
attempts =
|
||||||
|
repository.getAllAttempts().first().map {
|
||||||
|
BackupAttempt.fromAttempt(it)
|
||||||
|
},
|
||||||
|
deletedItems = repository.getDeletedItems()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun importBackupToRepository(
|
||||||
|
backup: ClimbDataBackup,
|
||||||
|
imagePathMapping: Map<String, String>
|
||||||
|
) {
|
||||||
|
val gyms = backup.gyms.map { it.toGym() }
|
||||||
|
val problems =
|
||||||
|
backup.problems.map { backupProblem ->
|
||||||
|
val imagePaths = backupProblem.imagePaths
|
||||||
|
val updatedImagePaths =
|
||||||
|
imagePaths?.map { oldPath -> imagePathMapping[oldPath] ?: oldPath }
|
||||||
|
backupProblem.copy(imagePaths = updatedImagePaths).toProblem()
|
||||||
|
}
|
||||||
|
val sessions = backup.sessions.map { it.toClimbSession() }
|
||||||
|
val attempts = backup.attempts.map { it.toAttempt() }
|
||||||
|
|
||||||
|
repository.resetAllData()
|
||||||
|
|
||||||
|
gyms.forEach { repository.insertGymWithoutSync(it) }
|
||||||
|
problems.forEach { repository.insertProblemWithoutSync(it) }
|
||||||
|
sessions.forEach { repository.insertSessionWithoutSync(it) }
|
||||||
|
attempts.forEach { repository.insertAttemptWithoutSync(it) }
|
||||||
|
|
||||||
|
repository.clearDeletedItems()
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun mergeDataSafely(serverBackup: ClimbDataBackup) {
|
||||||
|
AppLogger.d(TAG) { "Server data will overwrite local data. Performing full restore." }
|
||||||
|
val imagePathMapping = syncImagesFromServer(serverBackup)
|
||||||
|
importBackupToRepository(serverBackup, imagePathMapping)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleHttpError(code: Int): Nothing {
|
||||||
|
when (code) {
|
||||||
|
401 -> throw SyncException.Unauthorized
|
||||||
|
in 500..599 -> throw SyncException.ServerError(code)
|
||||||
|
else -> throw SyncException.InvalidResponse("HTTP error code: $code")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun testConnection() {
|
||||||
|
if (!_isConfigured.value) {
|
||||||
|
_isConnected.value = false
|
||||||
|
throw SyncException.NotConfigured
|
||||||
|
}
|
||||||
|
|
||||||
|
val request =
|
||||||
|
Request.Builder()
|
||||||
|
.url("$serverUrl/sync")
|
||||||
|
.header("Authorization", "Bearer $authToken")
|
||||||
|
.head()
|
||||||
|
.build()
|
||||||
|
try {
|
||||||
|
withContext(Dispatchers.IO) {
|
||||||
|
httpClient.newCall(request).execute().use { response ->
|
||||||
|
_isConnected.value = response.isSuccessful || response.code == 405
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!_isConnected.value) {
|
||||||
|
throw SyncException.NotConnected
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
_isConnected.value = false
|
||||||
|
throw SyncException.NetworkError(e.message ?: "Connection error")
|
||||||
|
} finally {
|
||||||
|
sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, _isConnected.value) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package com.atridad.ascently.data.sync
|
||||||
|
|
||||||
|
import java.io.IOException
|
||||||
|
import java.io.Serializable
|
||||||
|
|
||||||
|
sealed class SyncException(message: String) : IOException(message), Serializable {
|
||||||
|
object NotConfigured :
|
||||||
|
SyncException("Sync is not configured. Please set server URL and auth token.")
|
||||||
|
|
||||||
|
object NotConnected : SyncException("Not connected to server. Please test connection first.")
|
||||||
|
|
||||||
|
object Unauthorized : SyncException("Unauthorized. Please check your auth token.")
|
||||||
|
|
||||||
|
object ImageNotFound : SyncException("Image not found on server")
|
||||||
|
|
||||||
|
data class ServerError(val code: Int) : SyncException("Server error: HTTP $code")
|
||||||
|
data class InvalidResponse(val details: String) :
|
||||||
|
SyncException("Invalid server response: $details")
|
||||||
|
|
||||||
|
data class NetworkError(val details: String) : SyncException("Network error: $details")
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package com.atridad.ascently.data.sync
|
||||||
|
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
|
||||||
|
interface SyncProvider {
|
||||||
|
val type: SyncProviderType
|
||||||
|
val isConfigured: StateFlow<Boolean>
|
||||||
|
val isConnected: StateFlow<Boolean>
|
||||||
|
|
||||||
|
suspend fun sync()
|
||||||
|
suspend fun testConnection()
|
||||||
|
fun disconnect()
|
||||||
|
}
|
||||||
|
|
||||||
|
enum class SyncProviderType {
|
||||||
|
NONE,
|
||||||
|
SERVER
|
||||||
|
}
|
||||||
@@ -2,27 +2,9 @@ package com.atridad.ascently.data.sync
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.net.ConnectivityManager
|
|
||||||
import android.net.NetworkCapabilities
|
|
||||||
import androidx.annotation.RequiresPermission
|
|
||||||
import androidx.core.content.edit
|
import androidx.core.content.edit
|
||||||
import com.atridad.ascently.data.format.BackupAttempt
|
|
||||||
import com.atridad.ascently.utils.AppLogger
|
|
||||||
import com.atridad.ascently.data.format.BackupClimbSession
|
|
||||||
import com.atridad.ascently.data.format.BackupGym
|
|
||||||
import com.atridad.ascently.data.format.BackupProblem
|
|
||||||
import com.atridad.ascently.data.format.ClimbDataBackup
|
|
||||||
import com.atridad.ascently.data.repository.ClimbRepository
|
import com.atridad.ascently.data.repository.ClimbRepository
|
||||||
import com.atridad.ascently.data.state.DataStateManager
|
import com.atridad.ascently.utils.AppLogger
|
||||||
import com.atridad.ascently.utils.DateFormatUtils
|
|
||||||
import com.atridad.ascently.utils.ImageNamingUtils
|
|
||||||
import com.atridad.ascently.utils.ImageUtils
|
|
||||||
import java.io.IOException
|
|
||||||
import java.io.Serializable
|
|
||||||
import java.text.SimpleDateFormat
|
|
||||||
import java.util.Date
|
|
||||||
import java.util.Locale
|
|
||||||
import java.util.concurrent.TimeUnit
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
@@ -31,43 +13,21 @@ import kotlinx.coroutines.delay
|
|||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import kotlinx.coroutines.flow.StateFlow
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
import kotlinx.coroutines.flow.asStateFlow
|
import kotlinx.coroutines.flow.asStateFlow
|
||||||
import kotlinx.coroutines.flow.first
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.sync.Mutex
|
import kotlinx.coroutines.sync.Mutex
|
||||||
import kotlinx.coroutines.sync.withLock
|
import kotlinx.coroutines.sync.withLock
|
||||||
import kotlinx.coroutines.withContext
|
|
||||||
import kotlinx.serialization.json.Json
|
|
||||||
import okhttp3.MediaType.Companion.toMediaType
|
|
||||||
import okhttp3.OkHttpClient
|
|
||||||
import okhttp3.Request
|
|
||||||
import okhttp3.RequestBody.Companion.toRequestBody
|
|
||||||
|
|
||||||
class SyncService(private val context: Context, private val repository: ClimbRepository) {
|
class SyncService(private val context: Context, private val repository: ClimbRepository) {
|
||||||
|
|
||||||
private val dataStateManager = DataStateManager(context)
|
|
||||||
private val syncMutex = Mutex()
|
|
||||||
private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
|
private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
|
||||||
|
private val syncMutex = Mutex()
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "SyncService"
|
private const val TAG = "SyncService"
|
||||||
}
|
}
|
||||||
|
|
||||||
private val sharedPreferences: SharedPreferences =
|
// Currently we only support one provider, but this allows for future expansion
|
||||||
context.getSharedPreferences("sync_preferences", Context.MODE_PRIVATE)
|
private val provider: SyncProvider = AscentlySyncProvider(context, repository)
|
||||||
|
|
||||||
private val httpClient =
|
|
||||||
OkHttpClient.Builder()
|
|
||||||
.connectTimeout(45, TimeUnit.SECONDS)
|
|
||||||
.readTimeout(90, TimeUnit.SECONDS)
|
|
||||||
.writeTimeout(90, TimeUnit.SECONDS)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
private val json = Json {
|
|
||||||
prettyPrint = true
|
|
||||||
ignoreUnknownKeys = true
|
|
||||||
explicitNulls = false
|
|
||||||
coerceInputValues = true
|
|
||||||
}
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
private val _isSyncing = MutableStateFlow(false)
|
private val _isSyncing = MutableStateFlow(false)
|
||||||
@@ -79,11 +39,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
|
|||||||
private val _syncError = MutableStateFlow<String?>(null)
|
private val _syncError = MutableStateFlow<String?>(null)
|
||||||
val syncError: StateFlow<String?> = _syncError.asStateFlow()
|
val syncError: StateFlow<String?> = _syncError.asStateFlow()
|
||||||
|
|
||||||
private val _isConnected = MutableStateFlow(false)
|
// Delegate to provider
|
||||||
val isConnected: StateFlow<Boolean> = _isConnected.asStateFlow()
|
val isConnected: StateFlow<Boolean> = provider.isConnected
|
||||||
|
val isConfiguredFlow: StateFlow<Boolean> = provider.isConfigured
|
||||||
private val _isConfigured = MutableStateFlow(false)
|
|
||||||
val isConfiguredFlow: StateFlow<Boolean> = _isConfigured.asStateFlow()
|
|
||||||
|
|
||||||
private val _isTesting = MutableStateFlow(false)
|
private val _isTesting = MutableStateFlow(false)
|
||||||
val isTesting: StateFlow<Boolean> = _isTesting.asStateFlow()
|
val isTesting: StateFlow<Boolean> = _isTesting.asStateFlow()
|
||||||
@@ -91,56 +49,40 @@ class SyncService(private val context: Context, private val repository: ClimbRep
|
|||||||
private val _isAutoSyncEnabled = MutableStateFlow(true)
|
private val _isAutoSyncEnabled = MutableStateFlow(true)
|
||||||
val isAutoSyncEnabled: StateFlow<Boolean> = _isAutoSyncEnabled.asStateFlow()
|
val isAutoSyncEnabled: StateFlow<Boolean> = _isAutoSyncEnabled.asStateFlow()
|
||||||
|
|
||||||
private var isOfflineMode = false
|
|
||||||
|
|
||||||
// Debounced sync properties
|
// Debounced sync properties
|
||||||
private var syncJob: Job? = null
|
private var syncJob: Job? = null
|
||||||
private var pendingChanges = false
|
private var pendingChanges = false
|
||||||
private val syncDebounceDelay = 2000L // 2 seconds
|
private val syncDebounceDelay = 2000L // 2 seconds
|
||||||
|
|
||||||
// Configuration keys
|
private val sharedPreferences: SharedPreferences =
|
||||||
|
context.getSharedPreferences("sync_preferences", Context.MODE_PRIVATE)
|
||||||
|
|
||||||
private object Keys {
|
private object Keys {
|
||||||
const val SERVER_URL = "server_url"
|
|
||||||
const val AUTH_TOKEN = "auth_token"
|
|
||||||
const val IS_CONNECTED = "is_connected"
|
|
||||||
const val LAST_SYNC_TIME = "last_sync_time"
|
const val LAST_SYNC_TIME = "last_sync_time"
|
||||||
const val AUTO_SYNC_ENABLED = "auto_sync_enabled"
|
const val AUTO_SYNC_ENABLED = "auto_sync_enabled"
|
||||||
const val OFFLINE_MODE = "offline_mode"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
init {
|
||||||
loadInitialState()
|
loadInitialState()
|
||||||
updateConfiguredState()
|
|
||||||
repository.setAutoSyncCallback { serviceScope.launch { triggerAutoSync() } }
|
repository.setAutoSyncCallback { serviceScope.launch { triggerAutoSync() } }
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun loadInitialState() {
|
private fun loadInitialState() {
|
||||||
_lastSyncTime.value = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
|
_lastSyncTime.value = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
|
||||||
_isConnected.value = sharedPreferences.getBoolean(Keys.IS_CONNECTED, false)
|
|
||||||
_isAutoSyncEnabled.value = sharedPreferences.getBoolean(Keys.AUTO_SYNC_ENABLED, true)
|
_isAutoSyncEnabled.value = sharedPreferences.getBoolean(Keys.AUTO_SYNC_ENABLED, true)
|
||||||
isOfflineMode = sharedPreferences.getBoolean(Keys.OFFLINE_MODE, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun updateConfiguredState() {
|
|
||||||
_isConfigured.value = serverUrl.isNotBlank() && authToken.isNotBlank()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Proxy properties for Ascently provider configuration
|
||||||
var serverUrl: String
|
var serverUrl: String
|
||||||
get() = sharedPreferences.getString(Keys.SERVER_URL, "") ?: ""
|
get() = (provider as? AscentlySyncProvider)?.serverUrl ?: ""
|
||||||
set(value) {
|
set(value) {
|
||||||
sharedPreferences.edit { putString(Keys.SERVER_URL, value) }
|
(provider as? AscentlySyncProvider)?.serverUrl = value
|
||||||
updateConfiguredState()
|
|
||||||
_isConnected.value = false
|
|
||||||
sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, false) }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var authToken: String
|
var authToken: String
|
||||||
get() = sharedPreferences.getString(Keys.AUTH_TOKEN, "") ?: ""
|
get() = (provider as? AscentlySyncProvider)?.authToken ?: ""
|
||||||
set(value) {
|
set(value) {
|
||||||
sharedPreferences.edit { putString(Keys.AUTH_TOKEN, value) }
|
(provider as? AscentlySyncProvider)?.authToken = value
|
||||||
updateConfiguredState()
|
|
||||||
_isConnected.value = false
|
|
||||||
sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, false) }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setAutoSyncEnabled(enabled: Boolean) {
|
fun setAutoSyncEnabled(enabled: Boolean) {
|
||||||
@@ -148,93 +90,21 @@ class SyncService(private val context: Context, private val repository: ClimbRep
|
|||||||
sharedPreferences.edit { putBoolean(Keys.AUTO_SYNC_ENABLED, enabled) }
|
sharedPreferences.edit { putBoolean(Keys.AUTO_SYNC_ENABLED, enabled) }
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
|
|
||||||
private fun isNetworkAvailable(): Boolean {
|
|
||||||
val connectivityManager =
|
|
||||||
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
|
||||||
val network = connectivityManager.activeNetwork ?: return false
|
|
||||||
val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
|
|
||||||
return when {
|
|
||||||
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
|
|
||||||
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
|
|
||||||
else -> false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
|
|
||||||
suspend fun syncWithServer() {
|
suspend fun syncWithServer() {
|
||||||
if (isOfflineMode) {
|
if (!isConfiguredFlow.value) {
|
||||||
AppLogger.d(TAG) { "Sync skipped: Offline mode is enabled." }
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!isNetworkAvailable()) {
|
|
||||||
_syncError.value = "No internet connection."
|
|
||||||
AppLogger.d(TAG) { "Sync skipped: No internet connection." }
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (!_isConfigured.value) {
|
|
||||||
throw SyncException.NotConfigured
|
throw SyncException.NotConfigured
|
||||||
}
|
}
|
||||||
if (!_isConnected.value) {
|
|
||||||
throw SyncException.NotConnected
|
|
||||||
}
|
|
||||||
|
|
||||||
syncMutex.withLock {
|
syncMutex.withLock {
|
||||||
_isSyncing.value = true
|
_isSyncing.value = true
|
||||||
_syncError.value = null
|
_syncError.value = null
|
||||||
|
|
||||||
try {
|
try {
|
||||||
val localBackup = createBackupFromRepository()
|
provider.sync()
|
||||||
val serverBackup = downloadData()
|
|
||||||
|
|
||||||
val hasLocalData =
|
// Update last sync time from shared prefs (provider updates it)
|
||||||
localBackup.gyms.isNotEmpty() ||
|
_lastSyncTime.value = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
|
||||||
localBackup.problems.isNotEmpty() ||
|
|
||||||
localBackup.sessions.isNotEmpty() ||
|
|
||||||
localBackup.attempts.isNotEmpty()
|
|
||||||
|
|
||||||
val hasServerData =
|
|
||||||
serverBackup.gyms.isNotEmpty() ||
|
|
||||||
serverBackup.problems.isNotEmpty() ||
|
|
||||||
serverBackup.sessions.isNotEmpty() ||
|
|
||||||
serverBackup.attempts.isNotEmpty()
|
|
||||||
|
|
||||||
// If both client and server have been synced before, use delta sync
|
|
||||||
val lastSyncTimeStr = sharedPreferences.getString(Keys.LAST_SYNC_TIME, null)
|
|
||||||
if (hasLocalData && hasServerData && lastSyncTimeStr != null) {
|
|
||||||
AppLogger.d(TAG) { "Using delta sync for incremental updates" }
|
|
||||||
performDeltaSync(lastSyncTimeStr)
|
|
||||||
} else {
|
|
||||||
when {
|
|
||||||
!hasLocalData && hasServerData -> {
|
|
||||||
AppLogger.d(TAG) { "No local data found, performing full restore from server" }
|
|
||||||
val imagePathMapping = syncImagesFromServer(serverBackup)
|
|
||||||
importBackupToRepository(serverBackup, imagePathMapping)
|
|
||||||
AppLogger.d(TAG) { "Full restore completed" }
|
|
||||||
}
|
|
||||||
|
|
||||||
hasLocalData && !hasServerData -> {
|
|
||||||
AppLogger.d(TAG) { "No server data found, uploading local data to server" }
|
|
||||||
uploadData(localBackup)
|
|
||||||
syncImagesForBackup(localBackup)
|
|
||||||
AppLogger.d(TAG) { "Initial upload completed" }
|
|
||||||
}
|
|
||||||
|
|
||||||
hasLocalData && hasServerData -> {
|
|
||||||
AppLogger.d(TAG) { "Both local and server data exist, merging (server wins)" }
|
|
||||||
mergeDataSafely(serverBackup)
|
|
||||||
AppLogger.d(TAG) { "Merge completed" }
|
|
||||||
}
|
|
||||||
|
|
||||||
else -> {
|
|
||||||
AppLogger.d(TAG) { "No data to sync" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val now = DateFormatUtils.nowISO8601()
|
|
||||||
_lastSyncTime.value = now
|
|
||||||
sharedPreferences.edit { putString(Keys.LAST_SYNC_TIME, now) }
|
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
_syncError.value = e.message
|
_syncError.value = e.message
|
||||||
throw e
|
throw e
|
||||||
@@ -244,550 +114,21 @@ class SyncService(private val context: Context, private val repository: ClimbRep
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun performDeltaSync(lastSyncTimeStr: String) {
|
|
||||||
AppLogger.d(TAG) { "Starting delta sync with lastSyncTime=$lastSyncTimeStr" }
|
|
||||||
|
|
||||||
// Parse last sync time to filter modified items
|
|
||||||
val lastSyncDate = parseISO8601(lastSyncTimeStr) ?: Date(0)
|
|
||||||
|
|
||||||
// Collect items modified since last sync
|
|
||||||
val allGyms = repository.getAllGyms().first()
|
|
||||||
val modifiedGyms =
|
|
||||||
allGyms
|
|
||||||
.filter { gym -> parseISO8601(gym.updatedAt)?.after(lastSyncDate) == true }
|
|
||||||
.map { BackupGym.fromGym(it) }
|
|
||||||
|
|
||||||
val allProblems = repository.getAllProblems().first()
|
|
||||||
val modifiedProblems =
|
|
||||||
allProblems
|
|
||||||
.filter { problem ->
|
|
||||||
parseISO8601(problem.updatedAt)?.after(lastSyncDate) == true
|
|
||||||
}
|
|
||||||
.map { problem ->
|
|
||||||
val backupProblem = BackupProblem.fromProblem(problem)
|
|
||||||
val normalizedImagePaths =
|
|
||||||
problem.imagePaths.mapIndexed { index, _ ->
|
|
||||||
ImageNamingUtils.generateImageFilename(problem.id, index)
|
|
||||||
}
|
|
||||||
if (normalizedImagePaths.isNotEmpty()) {
|
|
||||||
backupProblem.copy(imagePaths = normalizedImagePaths)
|
|
||||||
} else {
|
|
||||||
backupProblem
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val allSessions = repository.getAllSessions().first()
|
|
||||||
val modifiedSessions =
|
|
||||||
allSessions
|
|
||||||
.filter { session ->
|
|
||||||
parseISO8601(session.updatedAt)?.after(lastSyncDate) == true
|
|
||||||
}
|
|
||||||
.map { BackupClimbSession.fromClimbSession(it) }
|
|
||||||
|
|
||||||
val allAttempts = repository.getAllAttempts().first()
|
|
||||||
val modifiedAttempts =
|
|
||||||
allAttempts
|
|
||||||
.filter { attempt ->
|
|
||||||
parseISO8601(attempt.createdAt)?.after(lastSyncDate) == true
|
|
||||||
}
|
|
||||||
.map { BackupAttempt.fromAttempt(it) }
|
|
||||||
|
|
||||||
val allDeletions = repository.getDeletedItems()
|
|
||||||
val modifiedDeletions =
|
|
||||||
allDeletions.filter { item ->
|
|
||||||
parseISO8601(item.deletedAt)?.after(lastSyncDate) == true
|
|
||||||
}
|
|
||||||
|
|
||||||
AppLogger.d(TAG) {
|
|
||||||
"Delta sync sending: gyms=${modifiedGyms.size}, problems=${modifiedProblems.size}, sessions=${modifiedSessions.size}, attempts=${modifiedAttempts.size}, deletions=${modifiedDeletions.size}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create delta request
|
|
||||||
val deltaRequest =
|
|
||||||
DeltaSyncRequest(
|
|
||||||
lastSyncTime = lastSyncTimeStr,
|
|
||||||
gyms = modifiedGyms,
|
|
||||||
problems = modifiedProblems,
|
|
||||||
sessions = modifiedSessions,
|
|
||||||
attempts = modifiedAttempts,
|
|
||||||
deletedItems = modifiedDeletions
|
|
||||||
)
|
|
||||||
|
|
||||||
val requestBody =
|
|
||||||
json.encodeToString(DeltaSyncRequest.serializer(), deltaRequest)
|
|
||||||
.toRequestBody("application/json".toMediaType())
|
|
||||||
|
|
||||||
val request =
|
|
||||||
Request.Builder()
|
|
||||||
.url("$serverUrl/sync/delta")
|
|
||||||
.header("Authorization", "Bearer $authToken")
|
|
||||||
.post(requestBody)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
val deltaResponse =
|
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
try {
|
|
||||||
httpClient.newCall(request).execute().use { response ->
|
|
||||||
if (response.isSuccessful) {
|
|
||||||
val body = response.body?.string()
|
|
||||||
if (!body.isNullOrEmpty()) {
|
|
||||||
json.decodeFromString(DeltaSyncResponse.serializer(), body)
|
|
||||||
} else {
|
|
||||||
throw SyncException.InvalidResponse("Empty response body")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
handleHttpError(response.code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: IOException) {
|
|
||||||
throw SyncException.NetworkError(e.message ?: "Network error")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
AppLogger.d(TAG) {
|
|
||||||
"Delta sync received: gyms=${deltaResponse.gyms.size}, problems=${deltaResponse.problems.size}, sessions=${deltaResponse.sessions.size}, attempts=${deltaResponse.attempts.size}, deletions=${deltaResponse.deletedItems.size}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply server changes to local data
|
|
||||||
applyDeltaResponse(deltaResponse)
|
|
||||||
|
|
||||||
// Sync only modified problem images
|
|
||||||
syncModifiedImages(modifiedProblems)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun parseISO8601(dateString: String): Date? {
|
|
||||||
return try {
|
|
||||||
val format = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US)
|
|
||||||
format.parse(dateString)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun applyDeltaResponse(response: DeltaSyncResponse) {
|
|
||||||
// Temporarily disable auto-sync to prevent recursive sync triggers
|
|
||||||
repository.setAutoSyncCallback(null)
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Merge and apply deletions first to prevent resurrection
|
|
||||||
val allDeletions = repository.getDeletedItems() + response.deletedItems
|
|
||||||
val uniqueDeletions = allDeletions.distinctBy { "${it.type}:${it.id}" }
|
|
||||||
|
|
||||||
AppLogger.d(TAG) { "Applying ${uniqueDeletions.size} deletion records before merging data" }
|
|
||||||
applyDeletions(uniqueDeletions)
|
|
||||||
|
|
||||||
// Build deleted item lookup set
|
|
||||||
val deletedItemSet = uniqueDeletions.map { "${it.type}:${it.id}" }.toSet()
|
|
||||||
|
|
||||||
// Download images for new/modified problems from server
|
|
||||||
val imagePathMapping = mutableMapOf<String, String>()
|
|
||||||
for (problem in response.problems) {
|
|
||||||
if (deletedItemSet.contains("problem:${problem.id}")) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
problem.imagePaths?.forEach { imagePath ->
|
|
||||||
val serverFilename = imagePath.substringAfterLast('/')
|
|
||||||
try {
|
|
||||||
val localImagePath = downloadImage(serverFilename)
|
|
||||||
if (localImagePath != null) {
|
|
||||||
imagePathMapping[imagePath] = localImagePath
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge gyms
|
|
||||||
val existingGyms = repository.getAllGyms().first()
|
|
||||||
for (backupGym in response.gyms) {
|
|
||||||
if (deletedItemSet.contains("gym:${backupGym.id}")) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
val existing = existingGyms.find { it.id == backupGym.id }
|
|
||||||
if (existing == null || backupGym.updatedAt >= existing.updatedAt) {
|
|
||||||
val gym = backupGym.toGym()
|
|
||||||
if (existing != null) {
|
|
||||||
repository.updateGym(gym)
|
|
||||||
} else {
|
|
||||||
repository.insertGym(gym)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge problems
|
|
||||||
val existingProblems = repository.getAllProblems().first()
|
|
||||||
for (backupProblem in response.problems) {
|
|
||||||
if (deletedItemSet.contains("problem:${backupProblem.id}")) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
val updatedImagePaths =
|
|
||||||
backupProblem.imagePaths?.map { oldPath ->
|
|
||||||
imagePathMapping[oldPath] ?: oldPath
|
|
||||||
}
|
|
||||||
val problemToMerge = backupProblem.copy(imagePaths = updatedImagePaths)
|
|
||||||
val problem = problemToMerge.toProblem()
|
|
||||||
|
|
||||||
val existing = existingProblems.find { it.id == backupProblem.id }
|
|
||||||
if (existing == null || backupProblem.updatedAt >= existing.updatedAt) {
|
|
||||||
if (existing != null) {
|
|
||||||
repository.updateProblem(problem)
|
|
||||||
} else {
|
|
||||||
repository.insertProblem(problem)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge sessions
|
|
||||||
val existingSessions = repository.getAllSessions().first()
|
|
||||||
for (backupSession in response.sessions) {
|
|
||||||
if (deletedItemSet.contains("session:${backupSession.id}")) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
val session = backupSession.toClimbSession()
|
|
||||||
val existing = existingSessions.find { it.id == backupSession.id }
|
|
||||||
if (existing == null || backupSession.updatedAt >= existing.updatedAt) {
|
|
||||||
if (existing != null) {
|
|
||||||
repository.updateSession(session)
|
|
||||||
} else {
|
|
||||||
repository.insertSession(session)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Merge attempts
|
|
||||||
val existingAttempts = repository.getAllAttempts().first()
|
|
||||||
for (backupAttempt in response.attempts) {
|
|
||||||
if (deletedItemSet.contains("attempt:${backupAttempt.id}")) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
val attempt = backupAttempt.toAttempt()
|
|
||||||
val existing = existingAttempts.find { it.id == backupAttempt.id }
|
|
||||||
if (existing == null || backupAttempt.createdAt >= existing.createdAt) {
|
|
||||||
if (existing != null) {
|
|
||||||
repository.updateAttempt(attempt)
|
|
||||||
} else {
|
|
||||||
repository.insertAttempt(attempt)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply deletions again for safety
|
|
||||||
applyDeletions(uniqueDeletions)
|
|
||||||
|
|
||||||
// Update deletion records
|
|
||||||
repository.clearDeletedItems()
|
|
||||||
uniqueDeletions.forEach { repository.trackDeletion(it.id, it.type) }
|
|
||||||
} finally {
|
|
||||||
// Re-enable auto-sync
|
|
||||||
repository.setAutoSyncCallback { serviceScope.launch { triggerAutoSync() } }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun applyDeletions(
|
|
||||||
deletions: List<com.atridad.ascently.data.format.DeletedItem>
|
|
||||||
) {
|
|
||||||
val existingGyms = repository.getAllGyms().first()
|
|
||||||
val existingProblems = repository.getAllProblems().first()
|
|
||||||
val existingSessions = repository.getAllSessions().first()
|
|
||||||
val existingAttempts = repository.getAllAttempts().first()
|
|
||||||
|
|
||||||
for (item in deletions) {
|
|
||||||
when (item.type) {
|
|
||||||
"gym" -> {
|
|
||||||
existingGyms.find { it.id == item.id }?.let { repository.deleteGym(it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
"problem" -> {
|
|
||||||
existingProblems.find { it.id == item.id }?.let { repository.deleteProblem(it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
"session" -> {
|
|
||||||
existingSessions.find { it.id == item.id }?.let { repository.deleteSession(it) }
|
|
||||||
}
|
|
||||||
|
|
||||||
"attempt" -> {
|
|
||||||
existingAttempts.find { it.id == item.id }?.let { repository.deleteAttempt(it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun syncModifiedImages(modifiedProblems: List<BackupProblem>) {
|
|
||||||
if (modifiedProblems.isEmpty()) return
|
|
||||||
|
|
||||||
AppLogger.d(TAG) { "Syncing images for ${modifiedProblems.size} modified problems" }
|
|
||||||
|
|
||||||
for (backupProblem in modifiedProblems) {
|
|
||||||
backupProblem.imagePaths?.forEach { imagePath ->
|
|
||||||
val filename = imagePath.substringAfterLast('/')
|
|
||||||
uploadImage(imagePath, filename)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun downloadData(): ClimbDataBackup {
|
|
||||||
val request =
|
|
||||||
Request.Builder()
|
|
||||||
.url("$serverUrl/sync")
|
|
||||||
.header("Authorization", "Bearer $authToken")
|
|
||||||
.get()
|
|
||||||
.build()
|
|
||||||
|
|
||||||
return withContext(Dispatchers.IO) {
|
|
||||||
try {
|
|
||||||
httpClient.newCall(request).execute().use { response ->
|
|
||||||
if (response.isSuccessful) {
|
|
||||||
val body = response.body?.string()
|
|
||||||
if (!body.isNullOrEmpty()) {
|
|
||||||
json.decodeFromString(body)
|
|
||||||
} else {
|
|
||||||
ClimbDataBackup(
|
|
||||||
exportedAt = DateFormatUtils.nowISO8601(),
|
|
||||||
gyms = emptyList(),
|
|
||||||
problems = emptyList(),
|
|
||||||
sessions = emptyList(),
|
|
||||||
attempts = emptyList()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
handleHttpError(response.code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: IOException) {
|
|
||||||
throw SyncException.NetworkError(e.message ?: "Network error")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun uploadData(backup: ClimbDataBackup) {
|
|
||||||
val requestBody =
|
|
||||||
json.encodeToString(backup).toRequestBody("application/json".toMediaType())
|
|
||||||
|
|
||||||
val request =
|
|
||||||
Request.Builder()
|
|
||||||
.url("$serverUrl/sync")
|
|
||||||
.header("Authorization", "Bearer $authToken")
|
|
||||||
.put(requestBody)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
try {
|
|
||||||
httpClient.newCall(request).execute().use { response ->
|
|
||||||
if (!response.isSuccessful) {
|
|
||||||
handleHttpError(response.code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: IOException) {
|
|
||||||
throw SyncException.NetworkError(e.message ?: "Network error")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun syncImagesFromServer(backup: ClimbDataBackup): Map<String, String> {
|
|
||||||
val imagePathMapping = mutableMapOf<String, String>()
|
|
||||||
val totalImages = backup.problems.sumOf { it.imagePaths?.size ?: 0 }
|
|
||||||
AppLogger.d(TAG) { "Starting image download from server for $totalImages images" }
|
|
||||||
|
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
backup.problems.forEach { problem ->
|
|
||||||
problem.imagePaths?.forEach { imagePath ->
|
|
||||||
val serverFilename = imagePath.substringAfterLast('/')
|
|
||||||
try {
|
|
||||||
val localImagePath = downloadImage(serverFilename)
|
|
||||||
if (localImagePath != null) {
|
|
||||||
imagePathMapping[imagePath] = localImagePath
|
|
||||||
}
|
|
||||||
} catch (_: SyncException.ImageNotFound) {
|
|
||||||
AppLogger.w(TAG) { "Image not found on server: $imagePath" }
|
|
||||||
} catch (e: Exception) {
|
|
||||||
AppLogger.w(TAG) { "Failed to download image $imagePath: ${e.message}" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return imagePathMapping
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun downloadImage(serverFilename: String): String? {
|
|
||||||
val request =
|
|
||||||
Request.Builder()
|
|
||||||
.url("$serverUrl/images/download?filename=$serverFilename")
|
|
||||||
.header("Authorization", "Bearer $authToken")
|
|
||||||
.build()
|
|
||||||
|
|
||||||
return withContext(Dispatchers.IO) {
|
|
||||||
try {
|
|
||||||
httpClient.newCall(request).execute().use { response ->
|
|
||||||
if (response.isSuccessful) {
|
|
||||||
response.body?.bytes()?.let {
|
|
||||||
ImageUtils.saveImageFromBytesWithFilename(context, it, serverFilename)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (response.code == 404) throw SyncException.ImageNotFound
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: IOException) {
|
|
||||||
AppLogger.e(TAG, e) { "Network error downloading image $serverFilename" }
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun syncImagesForBackup(backup: ClimbDataBackup) {
|
|
||||||
AppLogger.d(TAG) { "Starting image sync for backup with ${backup.problems.size} problems" }
|
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
backup.problems.forEach { problem ->
|
|
||||||
problem.imagePaths?.forEach { localPath ->
|
|
||||||
val filename = localPath.substringAfterLast('/')
|
|
||||||
uploadImage(localPath, filename)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun uploadImage(localPath: String, filename: String) {
|
|
||||||
val file = ImageUtils.getImageFile(context, localPath)
|
|
||||||
if (!file.exists()) {
|
|
||||||
AppLogger.w(TAG) { "Local image file not found, cannot upload: $localPath" }
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val requestBody = file.readBytes().toRequestBody("application/octet-stream".toMediaType())
|
|
||||||
|
|
||||||
val request =
|
|
||||||
Request.Builder()
|
|
||||||
.url("$serverUrl/images/upload?filename=$filename")
|
|
||||||
.header("Authorization", "Bearer $authToken")
|
|
||||||
.post(requestBody)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
try {
|
|
||||||
httpClient.newCall(request).execute().use { response ->
|
|
||||||
if (response.isSuccessful) {
|
|
||||||
AppLogger.d(TAG) { "Successfully uploaded image: $filename" }
|
|
||||||
} else {
|
|
||||||
AppLogger.w(TAG) {
|
|
||||||
"Failed to upload image $filename. Server responded with ${response.code}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: IOException) {
|
|
||||||
AppLogger.e(TAG, e) { "Network error uploading image $filename" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun createBackupFromRepository(): ClimbDataBackup {
|
|
||||||
return withContext(Dispatchers.Default) {
|
|
||||||
ClimbDataBackup(
|
|
||||||
exportedAt = dataStateManager.getLastModified(),
|
|
||||||
gyms = repository.getAllGyms().first().map { BackupGym.fromGym(it) },
|
|
||||||
problems =
|
|
||||||
repository.getAllProblems().first().map { problem ->
|
|
||||||
val backupProblem = BackupProblem.fromProblem(problem)
|
|
||||||
val normalizedImagePaths =
|
|
||||||
problem.imagePaths.mapIndexed { index, _ ->
|
|
||||||
ImageNamingUtils.generateImageFilename(
|
|
||||||
problem.id,
|
|
||||||
index
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (normalizedImagePaths.isNotEmpty()) {
|
|
||||||
backupProblem.copy(imagePaths = normalizedImagePaths)
|
|
||||||
} else {
|
|
||||||
backupProblem
|
|
||||||
}
|
|
||||||
},
|
|
||||||
sessions =
|
|
||||||
repository.getAllSessions().first().map {
|
|
||||||
BackupClimbSession.fromClimbSession(it)
|
|
||||||
},
|
|
||||||
attempts =
|
|
||||||
repository.getAllAttempts().first().map {
|
|
||||||
BackupAttempt.fromAttempt(it)
|
|
||||||
},
|
|
||||||
deletedItems = repository.getDeletedItems()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun importBackupToRepository(
|
|
||||||
backup: ClimbDataBackup,
|
|
||||||
imagePathMapping: Map<String, String>
|
|
||||||
) {
|
|
||||||
val gyms = backup.gyms.map { it.toGym() }
|
|
||||||
val problems =
|
|
||||||
backup.problems.map { backupProblem ->
|
|
||||||
val imagePaths = backupProblem.imagePaths
|
|
||||||
val updatedImagePaths =
|
|
||||||
imagePaths?.map { oldPath -> imagePathMapping[oldPath] ?: oldPath }
|
|
||||||
backupProblem.copy(imagePaths = updatedImagePaths).toProblem()
|
|
||||||
}
|
|
||||||
val sessions = backup.sessions.map { it.toClimbSession() }
|
|
||||||
val attempts = backup.attempts.map { it.toAttempt() }
|
|
||||||
|
|
||||||
repository.resetAllData()
|
|
||||||
|
|
||||||
gyms.forEach { repository.insertGymWithoutSync(it) }
|
|
||||||
problems.forEach { repository.insertProblemWithoutSync(it) }
|
|
||||||
sessions.forEach { repository.insertSessionWithoutSync(it) }
|
|
||||||
attempts.forEach { repository.insertAttemptWithoutSync(it) }
|
|
||||||
|
|
||||||
repository.clearDeletedItems()
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun mergeDataSafely(serverBackup: ClimbDataBackup) {
|
|
||||||
AppLogger.d(TAG) { "Server data will overwrite local data. Performing full restore." }
|
|
||||||
val imagePathMapping = syncImagesFromServer(serverBackup)
|
|
||||||
importBackupToRepository(serverBackup, imagePathMapping)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun handleHttpError(code: Int): Nothing {
|
|
||||||
when (code) {
|
|
||||||
401 -> throw SyncException.Unauthorized
|
|
||||||
in 500..599 -> throw SyncException.ServerError(code)
|
|
||||||
else -> throw SyncException.InvalidResponse("HTTP error code: $code")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun testConnection() {
|
suspend fun testConnection() {
|
||||||
if (!_isConfigured.value) {
|
|
||||||
_isConnected.value = false
|
|
||||||
_syncError.value = "Server URL or Auth Token is not set."
|
|
||||||
return
|
|
||||||
}
|
|
||||||
_isTesting.value = true
|
_isTesting.value = true
|
||||||
_syncError.value = null
|
_syncError.value = null
|
||||||
|
|
||||||
val request =
|
|
||||||
Request.Builder()
|
|
||||||
.url("$serverUrl/sync")
|
|
||||||
.header("Authorization", "Bearer $authToken")
|
|
||||||
.head()
|
|
||||||
.build()
|
|
||||||
try {
|
try {
|
||||||
withContext(Dispatchers.IO) {
|
provider.testConnection()
|
||||||
httpClient.newCall(request).execute().use { response ->
|
|
||||||
_isConnected.value = response.isSuccessful || response.code == 405
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!_isConnected.value) {
|
|
||||||
_syncError.value = "Connection failed. Check URL and token."
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
_isConnected.value = false
|
|
||||||
_syncError.value = "Connection error: ${e.message}"
|
_syncError.value = "Connection error: ${e.message}"
|
||||||
|
throw e
|
||||||
} finally {
|
} finally {
|
||||||
sharedPreferences.edit { putBoolean(Keys.IS_CONNECTED, _isConnected.value) }
|
|
||||||
_isTesting.value = false
|
_isTesting.value = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun triggerAutoSync() {
|
fun triggerAutoSync() {
|
||||||
if (!_isConfigured.value || !_isConnected.value || !_isAutoSyncEnabled.value) {
|
if (!isConfiguredFlow.value || !isConnected.value || !_isAutoSyncEnabled.value) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (_isSyncing.value) {
|
if (_isSyncing.value) {
|
||||||
@@ -812,30 +153,9 @@ class SyncService(private val context: Context, private val repository: ClimbRep
|
|||||||
|
|
||||||
fun clearConfiguration() {
|
fun clearConfiguration() {
|
||||||
syncJob?.cancel()
|
syncJob?.cancel()
|
||||||
serverUrl = ""
|
provider.disconnect()
|
||||||
authToken = ""
|
|
||||||
setAutoSyncEnabled(true)
|
setAutoSyncEnabled(true)
|
||||||
_lastSyncTime.value = null
|
_lastSyncTime.value = null
|
||||||
_isConnected.value = false
|
|
||||||
_syncError.value = null
|
_syncError.value = null
|
||||||
sharedPreferences.edit { clear() }
|
|
||||||
updateConfiguredState()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sealed class SyncException(message: String) : IOException(message), Serializable {
|
|
||||||
object NotConfigured :
|
|
||||||
SyncException("Sync is not configured. Please set server URL and auth token.")
|
|
||||||
|
|
||||||
object NotConnected : SyncException("Not connected to server. Please test connection first.")
|
|
||||||
|
|
||||||
object Unauthorized : SyncException("Unauthorized. Please check your auth token.")
|
|
||||||
|
|
||||||
object ImageNotFound : SyncException("Image not found on server")
|
|
||||||
|
|
||||||
data class ServerError(val code: Int) : SyncException("Server error: HTTP $code")
|
|
||||||
data class InvalidResponse(val details: String) :
|
|
||||||
SyncException("Invalid server response: $details")
|
|
||||||
|
|
||||||
data class NetworkError(val details: String) : SyncException("Network error: $details")
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -216,9 +216,7 @@ fun SettingsScreen(viewModel: ClimbViewModel) {
|
|||||||
// Manual Sync Button
|
// Manual Sync Button
|
||||||
TextButton(
|
TextButton(
|
||||||
onClick = {
|
onClick = {
|
||||||
coroutineScope.launch {
|
|
||||||
viewModel.performManualSync()
|
viewModel.performManualSync()
|
||||||
}
|
|
||||||
},
|
},
|
||||||
enabled = isConnected && !isSyncing
|
enabled = isConnected && !isSyncing
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -411,13 +411,15 @@ class ClimbViewModel(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Sync-related methods
|
// Sync-related methods
|
||||||
suspend fun performManualSync() {
|
fun performManualSync() {
|
||||||
|
viewModelScope.launch {
|
||||||
try {
|
try {
|
||||||
syncService.syncWithServer()
|
syncService.syncWithServer()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
setError("Sync failed: ${e.message}")
|
setError("Sync failed: ${e.message}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun testSyncConnection() {
|
suspend fun testSyncConnection() {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -5,10 +5,6 @@
|
|||||||
-->
|
-->
|
||||||
<data-extraction-rules>
|
<data-extraction-rules>
|
||||||
<cloud-backup>
|
<cloud-backup>
|
||||||
<!-- TODO: Use <include> and <exclude> to control what is backed up.
|
|
||||||
<include .../>
|
|
||||||
<exclude .../>
|
|
||||||
-->
|
|
||||||
</cloud-backup>
|
</cloud-backup>
|
||||||
<!--
|
<!--
|
||||||
<device-transfer>
|
<device-transfer>
|
||||||
|
|||||||
@@ -465,7 +465,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 34;
|
CURRENT_PROJECT_VERSION = 37;
|
||||||
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
||||||
DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
|
DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
@@ -487,7 +487,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 15.6;
|
MACOSX_DEPLOYMENT_TARGET = 15.6;
|
||||||
MARKETING_VERSION = 2.4.0;
|
MARKETING_VERSION = 2.5.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
|
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@@ -513,7 +513,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 34;
|
CURRENT_PROJECT_VERSION = 37;
|
||||||
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
||||||
DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
|
DRIVERKIT_DEPLOYMENT_TARGET = 24.6;
|
||||||
ENABLE_PREVIEWS = YES;
|
ENABLE_PREVIEWS = YES;
|
||||||
@@ -535,7 +535,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MACOSX_DEPLOYMENT_TARGET = 15.6;
|
MACOSX_DEPLOYMENT_TARGET = 15.6;
|
||||||
MARKETING_VERSION = 2.4.0;
|
MARKETING_VERSION = 2.5.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
|
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@@ -602,7 +602,7 @@
|
|||||||
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
|
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
|
||||||
CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
|
CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 34;
|
CURRENT_PROJECT_VERSION = 37;
|
||||||
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
INFOPLIST_FILE = SessionStatusLive/Info.plist;
|
INFOPLIST_FILE = SessionStatusLive/Info.plist;
|
||||||
@@ -613,7 +613,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
"@executable_path/../../Frameworks",
|
"@executable_path/../../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 2.4.0;
|
MARKETING_VERSION = 2.5.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
|
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SKIP_INSTALL = YES;
|
SKIP_INSTALL = YES;
|
||||||
@@ -632,7 +632,7 @@
|
|||||||
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
|
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
|
||||||
CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
|
CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 34;
|
CURRENT_PROJECT_VERSION = 37;
|
||||||
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
DEVELOPMENT_TEAM = 4BC9Y2LL4B;
|
||||||
GENERATE_INFOPLIST_FILE = YES;
|
GENERATE_INFOPLIST_FILE = YES;
|
||||||
INFOPLIST_FILE = SessionStatusLive/Info.plist;
|
INFOPLIST_FILE = SessionStatusLive/Info.plist;
|
||||||
@@ -643,7 +643,7 @@
|
|||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
"@executable_path/../../Frameworks",
|
"@executable_path/../../Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 2.4.0;
|
MARKETING_VERSION = 2.5.0;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
|
PRODUCT_BUNDLE_IDENTIFIER = com.atridad.Ascently.SessionStatusLive;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SKIP_INSTALL = YES;
|
SKIP_INSTALL = YES;
|
||||||
|
|||||||
Binary file not shown.
@@ -44,6 +44,7 @@ struct ContentView: View {
|
|||||||
.tag(4)
|
.tag(4)
|
||||||
}
|
}
|
||||||
.environmentObject(dataManager)
|
.environmentObject(dataManager)
|
||||||
|
.environmentObject(MusicService.shared)
|
||||||
.onChange(of: scenePhase) { oldPhase, newPhase in
|
.onChange(of: scenePhase) { oldPhase, newPhase in
|
||||||
if newPhase == .active {
|
if newPhase == .active {
|
||||||
// Add slight delay to ensure app is fully loaded
|
// Add slight delay to ensure app is fully loaded
|
||||||
|
|||||||
@@ -15,5 +15,7 @@
|
|||||||
<string>This app needs access to save your climbing workouts to Apple Health.</string>
|
<string>This app needs access to save your climbing workouts to Apple Health.</string>
|
||||||
<key>NSHealthUpdateUsageDescription</key>
|
<key>NSHealthUpdateUsageDescription</key>
|
||||||
<string>This app needs access to save your climbing workouts to Apple Health.</string>
|
<string>This app needs access to save your climbing workouts to Apple Health.</string>
|
||||||
|
<key>NSAppleMusicUsageDescription</key>
|
||||||
|
<string>This app (optionally) needs access to your music library to play your selected playlist during climbing sessions.</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
197
ios/Ascently/Services/MusicService.swift
Normal file
197
ios/Ascently/Services/MusicService.swift
Normal file
@@ -0,0 +1,197 @@
|
|||||||
|
import MusicKit
|
||||||
|
import AVFoundation
|
||||||
|
import SwiftUI
|
||||||
|
import Combine
|
||||||
|
|
||||||
|
@MainActor
|
||||||
|
class MusicService: ObservableObject {
|
||||||
|
static let shared = MusicService()
|
||||||
|
|
||||||
|
@Published var isAuthorized = false
|
||||||
|
@Published var playlists: MusicItemCollection<Playlist> = []
|
||||||
|
@Published var selectedPlaylistId: String? {
|
||||||
|
didSet {
|
||||||
|
UserDefaults.standard.set(selectedPlaylistId, forKey: "ascently_selected_playlist_id")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Published var isMusicEnabled: Bool {
|
||||||
|
didSet {
|
||||||
|
UserDefaults.standard.set(isMusicEnabled, forKey: "ascently_music_enabled")
|
||||||
|
if !isMusicEnabled {
|
||||||
|
// Genuinely unsure what I want to do with this but we should account for it at some point
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Published var isAutoPlayEnabled: Bool {
|
||||||
|
didSet {
|
||||||
|
UserDefaults.standard.set(isAutoPlayEnabled, forKey: "ascently_music_autoplay_enabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Published var isAutoStopEnabled: Bool {
|
||||||
|
didSet {
|
||||||
|
UserDefaults.standard.set(isAutoStopEnabled, forKey: "ascently_music_autostop_enabled")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Published var isPlaying = false
|
||||||
|
|
||||||
|
private var cancellables = Set<AnyCancellable>()
|
||||||
|
private var hasStartedSessionPlayback = false
|
||||||
|
private var currentPlaylistTrackIds: Set<MusicItemID> = []
|
||||||
|
|
||||||
|
private init() {
|
||||||
|
self.selectedPlaylistId = UserDefaults.standard.string(forKey: "ascently_selected_playlist_id")
|
||||||
|
self.isMusicEnabled = UserDefaults.standard.bool(forKey: "ascently_music_enabled")
|
||||||
|
self.isAutoPlayEnabled = UserDefaults.standard.bool(forKey: "ascently_music_autoplay_enabled")
|
||||||
|
self.isAutoStopEnabled = UserDefaults.standard.bool(forKey: "ascently_music_autostop_enabled")
|
||||||
|
|
||||||
|
if isMusicEnabled {
|
||||||
|
Task {
|
||||||
|
await checkAuthorizationStatus()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setupObservers()
|
||||||
|
}
|
||||||
|
|
||||||
|
private func setupObservers() {
|
||||||
|
SystemMusicPlayer.shared.state.objectWillChange
|
||||||
|
.sink { [weak self] _ in
|
||||||
|
self?.updatePlaybackStatus()
|
||||||
|
}
|
||||||
|
.store(in: &cancellables)
|
||||||
|
|
||||||
|
SystemMusicPlayer.shared.queue.objectWillChange
|
||||||
|
.sink { [weak self] _ in
|
||||||
|
self?.checkQueueConsistency()
|
||||||
|
}
|
||||||
|
.store(in: &cancellables)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func updatePlaybackStatus() {
|
||||||
|
Task { @MainActor [weak self] in
|
||||||
|
self?.isPlaying = SystemMusicPlayer.shared.state.playbackStatus == .playing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func checkQueueConsistency() {
|
||||||
|
guard hasStartedSessionPlayback else { return }
|
||||||
|
|
||||||
|
Task { @MainActor [weak self] in
|
||||||
|
guard let self = self else { return }
|
||||||
|
if let currentEntry = SystemMusicPlayer.shared.queue.currentEntry,
|
||||||
|
let item = currentEntry.item {
|
||||||
|
if !self.currentPlaylistTrackIds.isEmpty && !self.currentPlaylistTrackIds.contains(item.id) {
|
||||||
|
self.hasStartedSessionPlayback = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func toggleMusicEnabled(_ enabled: Bool) {
|
||||||
|
isMusicEnabled = enabled
|
||||||
|
if enabled {
|
||||||
|
Task {
|
||||||
|
await checkAuthorizationStatus()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func checkAuthorizationStatus() async {
|
||||||
|
let status = await MusicAuthorization.request()
|
||||||
|
self.isAuthorized = status == .authorized
|
||||||
|
if isAuthorized {
|
||||||
|
await fetchPlaylists()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func fetchPlaylists() async {
|
||||||
|
guard isAuthorized else { return }
|
||||||
|
do {
|
||||||
|
var request = MusicLibraryRequest<Playlist>()
|
||||||
|
request.sort(by: \.name, ascending: true)
|
||||||
|
let response = try await request.response()
|
||||||
|
self.playlists = response.items
|
||||||
|
} catch {
|
||||||
|
print("Error fetching playlists: \(error)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func playSelectedPlaylistIfHeadphonesConnected() {
|
||||||
|
guard isMusicEnabled, isAutoPlayEnabled, let playlistId = selectedPlaylistId else { return }
|
||||||
|
|
||||||
|
if isHeadphonesConnected() {
|
||||||
|
playPlaylist(id: playlistId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func resetSessionPlaybackState() {
|
||||||
|
hasStartedSessionPlayback = false
|
||||||
|
currentPlaylistTrackIds.removeAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
func playPlaylist(id: String) {
|
||||||
|
print("Attempting to play playlist \(id)")
|
||||||
|
Task {
|
||||||
|
do {
|
||||||
|
if playlists.isEmpty {
|
||||||
|
await fetchPlaylists()
|
||||||
|
}
|
||||||
|
|
||||||
|
var targetPlaylist: Playlist?
|
||||||
|
|
||||||
|
if let playlist = playlists.first(where: { $0.id.rawValue == id }) {
|
||||||
|
targetPlaylist = playlist
|
||||||
|
} else {
|
||||||
|
var request = MusicLibraryRequest<Playlist>()
|
||||||
|
request.filter(matching: \.id, equalTo: MusicItemID(id))
|
||||||
|
let response = try await request.response()
|
||||||
|
targetPlaylist = response.items.first
|
||||||
|
}
|
||||||
|
|
||||||
|
if let playlist = targetPlaylist {
|
||||||
|
let detailedPlaylist = try await playlist.with([.tracks])
|
||||||
|
if let tracks = detailedPlaylist.tracks {
|
||||||
|
self.currentPlaylistTrackIds = Set(tracks.map { $0.id })
|
||||||
|
}
|
||||||
|
|
||||||
|
SystemMusicPlayer.shared.queue = [playlist]
|
||||||
|
try await SystemMusicPlayer.shared.play()
|
||||||
|
hasStartedSessionPlayback = true
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
print("Error playing playlist: \(error)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func stopPlaybackIfEnabled() {
|
||||||
|
guard isMusicEnabled, isAutoStopEnabled else { return }
|
||||||
|
SystemMusicPlayer.shared.stop()
|
||||||
|
}
|
||||||
|
|
||||||
|
func togglePlayback() {
|
||||||
|
Task {
|
||||||
|
if isPlaying {
|
||||||
|
SystemMusicPlayer.shared.pause()
|
||||||
|
} else {
|
||||||
|
if let playlistId = selectedPlaylistId, !hasStartedSessionPlayback {
|
||||||
|
playPlaylist(id: playlistId)
|
||||||
|
} else {
|
||||||
|
try? await SystemMusicPlayer.shared.play()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private func isHeadphonesConnected() -> Bool {
|
||||||
|
let route = AVAudioSession.sharedInstance().currentRoute
|
||||||
|
return route.outputs.contains { port in
|
||||||
|
port.portType == .headphones ||
|
||||||
|
port.portType == .bluetoothA2DP ||
|
||||||
|
port.portType == .bluetoothLE ||
|
||||||
|
port.portType == .bluetoothHFP ||
|
||||||
|
port.portType == .usbAudio ||
|
||||||
|
port.portType == .airPlay
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,6 +38,7 @@ class ClimbingDataManager: ObservableObject {
|
|||||||
|
|
||||||
let syncService = SyncService()
|
let syncService = SyncService()
|
||||||
let healthKitService = HealthKitService.shared
|
let healthKitService = HealthKitService.shared
|
||||||
|
let musicService = MusicService.shared
|
||||||
|
|
||||||
@Published var isSyncing = false
|
@Published var isSyncing = false
|
||||||
private enum Keys {
|
private enum Keys {
|
||||||
@@ -437,13 +438,15 @@ class ClimbingDataManager: ObservableObject {
|
|||||||
saveSessions()
|
saveSessions()
|
||||||
DataStateManager.shared.updateDataState()
|
DataStateManager.shared.updateDataState()
|
||||||
|
|
||||||
// MARK: - Start Live Activity for new session
|
|
||||||
if let gym = gym(withId: gymId) {
|
if let gym = gym(withId: gymId) {
|
||||||
await LiveActivityManager.shared.startLiveActivity(
|
await LiveActivityManager.shared.startLiveActivity(
|
||||||
for: newSession,
|
for: newSession,
|
||||||
gymName: gym.name)
|
gymName: gym.name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
musicService.resetSessionPlaybackState()
|
||||||
|
musicService.playSelectedPlaylistIfHeadphonesConnected()
|
||||||
|
|
||||||
if healthKitService.isEnabled {
|
if healthKitService.isEnabled {
|
||||||
do {
|
do {
|
||||||
try await healthKitService.startWorkout(
|
try await healthKitService.startWorkout(
|
||||||
@@ -488,9 +491,13 @@ class ClimbingDataManager: ObservableObject {
|
|||||||
// Trigger auto-sync if enabled
|
// Trigger auto-sync if enabled
|
||||||
syncService.triggerAutoSync(dataManager: self)
|
syncService.triggerAutoSync(dataManager: self)
|
||||||
|
|
||||||
// MARK: - End Live Activity after session ends
|
|
||||||
await LiveActivityManager.shared.endLiveActivity()
|
await LiveActivityManager.shared.endLiveActivity()
|
||||||
|
|
||||||
|
if UserDefaults.standard.bool(forKey: "isAutoStopMusicEnabled") {
|
||||||
|
musicService.stopPlaybackIfEnabled()
|
||||||
|
}
|
||||||
|
musicService.stopPlaybackIfEnabled()
|
||||||
|
|
||||||
if healthKitService.isEnabled {
|
if healthKitService.isEnabled {
|
||||||
do {
|
do {
|
||||||
try await healthKitService.endWorkout(
|
try await healthKitService.endWorkout(
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ final class LiveActivityManager {
|
|||||||
func startHealthChecks() {
|
func startHealthChecks() {
|
||||||
stopHealthChecks() // Stop any existing timer
|
stopHealthChecks() // Stop any existing timer
|
||||||
|
|
||||||
AppLogger.debug("🩺 Starting Live Activity health checks", tag: Self.logTag)
|
AppLogger.debug("Starting Live Activity health checks", tag: Self.logTag)
|
||||||
healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) {
|
healthCheckTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) {
|
||||||
[weak self] _ in
|
[weak self] _ in
|
||||||
Task { @MainActor [weak self] in
|
Task { @MainActor [weak self] in
|
||||||
@@ -233,7 +233,7 @@ final class LiveActivityManager {
|
|||||||
// Only perform health check if it's been at least 25 seconds
|
// Only perform health check if it's been at least 25 seconds
|
||||||
guard timeSinceLastCheck >= 25 else { return }
|
guard timeSinceLastCheck >= 25 else { return }
|
||||||
|
|
||||||
AppLogger.debug("🩺 Performing Live Activity health check", tag: Self.logTag)
|
AppLogger.debug("Performing Live Activity health check", tag: Self.logTag)
|
||||||
lastHealthCheck = now
|
lastHealthCheck = now
|
||||||
|
|
||||||
let activities = Activity<SessionActivityAttributes>.activities
|
let activities = Activity<SessionActivityAttributes>.activities
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ struct CalendarView: View {
|
|||||||
let gym = dataManager.gym(withId: activeSession.gymId)
|
let gym = dataManager.gym(withId: activeSession.gymId)
|
||||||
{
|
{
|
||||||
ActiveSessionBanner(session: activeSession, gym: gym)
|
ActiveSessionBanner(session: activeSession, gym: gym)
|
||||||
|
.environmentObject(MusicService.shared)
|
||||||
.padding(.horizontal, 16)
|
.padding(.horizontal, 16)
|
||||||
.padding(.top, 8)
|
.padding(.top, 8)
|
||||||
.padding(.bottom, 16)
|
.padding(.bottom, 16)
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
import Combine
|
import Combine
|
||||||
|
import MusicKit
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct SessionDetailView: View {
|
struct SessionDetailView: View {
|
||||||
let sessionId: UUID
|
let sessionId: UUID
|
||||||
@EnvironmentObject var dataManager: ClimbingDataManager
|
@EnvironmentObject var dataManager: ClimbingDataManager
|
||||||
@EnvironmentObject var themeManager: ThemeManager
|
@EnvironmentObject var themeManager: ThemeManager
|
||||||
|
@EnvironmentObject var musicService: MusicService
|
||||||
@Environment(\.dismiss) private var dismiss
|
@Environment(\.dismiss) private var dismiss
|
||||||
@State private var showingDeleteAlert = false
|
@State private var showingDeleteAlert = false
|
||||||
@State private var showingAddAttempt = false
|
@State private var showingAddAttempt = false
|
||||||
@@ -41,13 +43,19 @@ struct SessionDetailView: View {
|
|||||||
Section {
|
Section {
|
||||||
SessionHeaderCard(
|
SessionHeaderCard(
|
||||||
session: session, gym: gym, stats: sessionStats)
|
session: session, gym: gym, stats: sessionStats)
|
||||||
.listRowInsets(EdgeInsets())
|
.listRowInsets(EdgeInsets(top: 6, leading: 16, bottom: 6, trailing: 16))
|
||||||
.listRowBackground(Color.clear)
|
.listRowBackground(Color.clear)
|
||||||
.listRowSeparator(.hidden)
|
.listRowSeparator(.hidden)
|
||||||
.padding(.bottom, 8)
|
|
||||||
|
if session.status == .active && musicService.isMusicEnabled && musicService.isAuthorized {
|
||||||
|
MusicControlCard()
|
||||||
|
.listRowInsets(EdgeInsets(top: 6, leading: 16, bottom: 6, trailing: 16))
|
||||||
|
.listRowBackground(Color.clear)
|
||||||
|
.listRowSeparator(.hidden)
|
||||||
|
}
|
||||||
|
|
||||||
SessionStatsCard(stats: sessionStats)
|
SessionStatsCard(stats: sessionStats)
|
||||||
.listRowInsets(EdgeInsets())
|
.listRowInsets(EdgeInsets(top: 6, leading: 16, bottom: 6, trailing: 16))
|
||||||
.listRowBackground(Color.clear)
|
.listRowBackground(Color.clear)
|
||||||
.listRowSeparator(.hidden)
|
.listRowSeparator(.hidden)
|
||||||
}
|
}
|
||||||
@@ -76,6 +84,7 @@ struct SessionDetailView: View {
|
|||||||
)
|
)
|
||||||
.listRowBackground(Color.clear)
|
.listRowBackground(Color.clear)
|
||||||
.listRowSeparator(.hidden)
|
.listRowSeparator(.hidden)
|
||||||
|
.listRowInsets(EdgeInsets(top: 6, leading: 16, bottom: 6, trailing: 16))
|
||||||
} else {
|
} else {
|
||||||
ForEach(attemptsWithProblems.indices, id: \.self) { index in
|
ForEach(attemptsWithProblems.indices, id: \.self) { index in
|
||||||
let (attempt, problem) = attemptsWithProblems[index]
|
let (attempt, problem) = attemptsWithProblems[index]
|
||||||
@@ -91,6 +100,7 @@ struct SessionDetailView: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Label("Delete", systemImage: "trash")
|
Label("Delete", systemImage: "trash")
|
||||||
}
|
}
|
||||||
|
.tint(.red)
|
||||||
.accessibilityLabel("Delete attempt")
|
.accessibilityLabel("Delete attempt")
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
@@ -98,7 +108,7 @@ struct SessionDetailView: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Label("Edit", systemImage: "pencil")
|
Label("Edit", systemImage: "pencil")
|
||||||
}
|
}
|
||||||
.tint(themeManager.accentColor)
|
.tint(.indigo)
|
||||||
.accessibilityLabel("Edit attempt")
|
.accessibilityLabel("Edit attempt")
|
||||||
}
|
}
|
||||||
.onTapGesture {
|
.onTapGesture {
|
||||||
@@ -441,6 +451,53 @@ struct SessionStats {
|
|||||||
let uniqueProblemsCompleted: Int
|
let uniqueProblemsCompleted: Int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct MusicControlCard: View {
|
||||||
|
@EnvironmentObject var musicService: MusicService
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
HStack {
|
||||||
|
Image(systemName: "music.note")
|
||||||
|
.font(.title2)
|
||||||
|
.foregroundColor(.pink)
|
||||||
|
.frame(width: 40, height: 40)
|
||||||
|
.background(Color.pink.opacity(0.1))
|
||||||
|
.clipShape(Circle())
|
||||||
|
|
||||||
|
VStack(alignment: .leading, spacing: 2) {
|
||||||
|
Text("Music")
|
||||||
|
.font(.headline)
|
||||||
|
|
||||||
|
if let playlistId = musicService.selectedPlaylistId,
|
||||||
|
let playlist = musicService.playlists.first(where: { $0.id.rawValue == playlistId }) {
|
||||||
|
Text(playlist.name)
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
} else {
|
||||||
|
Text("No playlist selected")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer()
|
||||||
|
|
||||||
|
Button(action: {
|
||||||
|
musicService.togglePlayback()
|
||||||
|
}) {
|
||||||
|
Image(systemName: musicService.isPlaying ? "pause.circle.fill" : "play.circle.fill")
|
||||||
|
.font(.system(size: 32))
|
||||||
|
.foregroundColor(.pink)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding()
|
||||||
|
.background(
|
||||||
|
RoundedRectangle(cornerRadius: 16)
|
||||||
|
.fill(Color(.secondarySystemGroupedBackground))
|
||||||
|
.shadow(color: .black.opacity(0.05), radius: 5, x: 0, y: 2)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
NavigationView {
|
NavigationView {
|
||||||
SessionDetailView(sessionId: UUID())
|
SessionDetailView(sessionId: UUID())
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ struct GymsList: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Label("Delete", systemImage: "trash")
|
Label("Delete", systemImage: "trash")
|
||||||
}
|
}
|
||||||
|
.tint(.red)
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
gymToEdit = gym
|
gymToEdit = gym
|
||||||
@@ -73,7 +74,7 @@ struct GymsList: View {
|
|||||||
Text("Edit")
|
Text("Edit")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.tint(themeManager.accentColor)
|
.tint(.indigo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.alert("Delete Gym", isPresented: .constant(gymToDelete != nil)) {
|
.alert("Delete Gym", isPresented: .constant(gymToDelete != nil)) {
|
||||||
|
|||||||
@@ -8,10 +8,16 @@ struct ProblemsView: View {
|
|||||||
@State private var selectedGym: Gym?
|
@State private var selectedGym: Gym?
|
||||||
@State private var searchText = ""
|
@State private var searchText = ""
|
||||||
@State private var showingSearch = false
|
@State private var showingSearch = false
|
||||||
|
@State private var showingFilters = false
|
||||||
@FocusState private var isSearchFocused: Bool
|
@FocusState private var isSearchFocused: Bool
|
||||||
|
|
||||||
@State private var cachedFilteredProblems: [Problem] = []
|
@State private var cachedFilteredProblems: [Problem] = []
|
||||||
|
|
||||||
|
// State moved from ProblemsList
|
||||||
|
@State private var problemToDelete: Problem?
|
||||||
|
@State private var problemToEdit: Problem?
|
||||||
|
@State private var animationKey = 0
|
||||||
|
|
||||||
private func updateFilteredProblems() {
|
private func updateFilteredProblems() {
|
||||||
Task(priority: .userInitiated) {
|
Task(priority: .userInitiated) {
|
||||||
let result = await computeFilteredProblems()
|
let result = await computeFilteredProblems()
|
||||||
@@ -71,61 +77,68 @@ struct ProblemsView: View {
|
|||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
Group {
|
Group {
|
||||||
VStack(spacing: 0) {
|
|
||||||
if showingSearch {
|
|
||||||
HStack(spacing: 8) {
|
|
||||||
Image(systemName: "magnifyingglass")
|
|
||||||
.foregroundColor(.secondary)
|
|
||||||
.font(.system(size: 16, weight: .medium))
|
|
||||||
|
|
||||||
TextField("Search problems...", text: $searchText)
|
|
||||||
.textFieldStyle(.plain)
|
|
||||||
.font(.system(size: 16))
|
|
||||||
.focused($isSearchFocused)
|
|
||||||
.submitLabel(.search)
|
|
||||||
}
|
|
||||||
.padding(.horizontal, 12)
|
|
||||||
.padding(.vertical, 10)
|
|
||||||
.background {
|
|
||||||
if #available(iOS 18.0, *) {
|
|
||||||
RoundedRectangle(cornerRadius: 12)
|
|
||||||
.fill(.regularMaterial)
|
|
||||||
.overlay {
|
|
||||||
RoundedRectangle(cornerRadius: 12)
|
|
||||||
.stroke(.quaternary, lineWidth: 0.5)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
RoundedRectangle(cornerRadius: 10)
|
|
||||||
.fill(Color(.systemGray6))
|
|
||||||
.overlay {
|
|
||||||
RoundedRectangle(cornerRadius: 10)
|
|
||||||
.stroke(Color(.systemGray4), lineWidth: 0.5)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.padding(.horizontal)
|
|
||||||
.padding(.top, 8)
|
|
||||||
.animation(.easeInOut(duration: 0.3), value: showingSearch)
|
|
||||||
}
|
|
||||||
|
|
||||||
if !dataManager.problems.isEmpty && !showingSearch {
|
|
||||||
FilterSection(
|
|
||||||
selectedClimbType: $selectedClimbType,
|
|
||||||
selectedGym: $selectedGym,
|
|
||||||
filteredProblems: cachedFilteredProblems
|
|
||||||
)
|
|
||||||
.padding()
|
|
||||||
.background(.regularMaterial)
|
|
||||||
}
|
|
||||||
|
|
||||||
if cachedFilteredProblems.isEmpty {
|
if cachedFilteredProblems.isEmpty {
|
||||||
|
VStack(spacing: 0) {
|
||||||
|
headerContent
|
||||||
|
|
||||||
EmptyProblemsView(
|
EmptyProblemsView(
|
||||||
isEmpty: dataManager.problems.isEmpty,
|
isEmpty: dataManager.problems.isEmpty,
|
||||||
isFiltered: !dataManager.problems.isEmpty
|
isFiltered: !dataManager.problems.isEmpty
|
||||||
)
|
)
|
||||||
} else {
|
|
||||||
ProblemsList(problems: cachedFilteredProblems)
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
List {
|
||||||
|
if showingSearch {
|
||||||
|
Section {
|
||||||
|
headerContent
|
||||||
|
}
|
||||||
|
.listRowInsets(EdgeInsets())
|
||||||
|
.listRowSeparator(.hidden)
|
||||||
|
.listRowBackground(Color.clear)
|
||||||
|
}
|
||||||
|
|
||||||
|
ForEach(cachedFilteredProblems) { problem in
|
||||||
|
NavigationLink(destination: ProblemDetailView(problemId: problem.id)) {
|
||||||
|
ProblemRow(problem: problem)
|
||||||
|
}
|
||||||
|
.swipeActions(edge: .trailing, allowsFullSwipe: false) {
|
||||||
|
Button(role: .destructive) {
|
||||||
|
problemToDelete = problem
|
||||||
|
} label: {
|
||||||
|
Label("Delete", systemImage: "trash")
|
||||||
|
}
|
||||||
|
.tint(.red)
|
||||||
|
|
||||||
|
Button {
|
||||||
|
withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1))
|
||||||
|
{
|
||||||
|
let updatedProblem = problem.updated(isActive: !problem.isActive)
|
||||||
|
dataManager.updateProblem(updatedProblem)
|
||||||
|
}
|
||||||
|
} label: {
|
||||||
|
Label(
|
||||||
|
problem.isActive ? "Mark as Reset" : "Mark as Active",
|
||||||
|
systemImage: problem.isActive ? "xmark.circle" : "checkmark.circle")
|
||||||
|
}
|
||||||
|
.tint(.orange)
|
||||||
|
|
||||||
|
Button {
|
||||||
|
problemToEdit = problem
|
||||||
|
} label: {
|
||||||
|
HStack {
|
||||||
|
Image(systemName: "pencil")
|
||||||
|
Text("Edit")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.tint(.indigo)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.listStyle(.plain)
|
||||||
|
.animation(
|
||||||
|
.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1),
|
||||||
|
value: animationKey
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("Problems")
|
.navigationTitle("Problems")
|
||||||
@@ -166,6 +179,14 @@ struct ProblemsView: View {
|
|||||||
.foregroundColor(showingSearch ? .secondary : themeManager.accentColor)
|
.foregroundColor(showingSearch ? .secondary : themeManager.accentColor)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Button(action: {
|
||||||
|
showingFilters = true
|
||||||
|
}) {
|
||||||
|
Image(systemName: (selectedClimbType != nil || selectedGym != nil) ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease.circle")
|
||||||
|
.font(.system(size: 16, weight: .medium))
|
||||||
|
.foregroundColor(themeManager.accentColor)
|
||||||
|
}
|
||||||
|
|
||||||
if !dataManager.gyms.isEmpty {
|
if !dataManager.gyms.isEmpty {
|
||||||
Button("Add") {
|
Button("Add") {
|
||||||
showingAddProblem = true
|
showingAddProblem = true
|
||||||
@@ -176,6 +197,32 @@ struct ProblemsView: View {
|
|||||||
.sheet(isPresented: $showingAddProblem) {
|
.sheet(isPresented: $showingAddProblem) {
|
||||||
AddEditProblemView()
|
AddEditProblemView()
|
||||||
}
|
}
|
||||||
|
.sheet(isPresented: $showingFilters) {
|
||||||
|
FilterSheet(
|
||||||
|
selectedClimbType: $selectedClimbType,
|
||||||
|
selectedGym: $selectedGym,
|
||||||
|
filteredProblems: cachedFilteredProblems
|
||||||
|
)
|
||||||
|
.presentationDetents([.height(320)])
|
||||||
|
}
|
||||||
|
.sheet(item: $problemToEdit) { problem in
|
||||||
|
AddEditProblemView(problemId: problem.id)
|
||||||
|
}
|
||||||
|
.alert("Delete Problem", isPresented: .constant(problemToDelete != nil)) {
|
||||||
|
Button("Cancel", role: .cancel) {
|
||||||
|
problemToDelete = nil
|
||||||
|
}
|
||||||
|
Button("Delete", role: .destructive) {
|
||||||
|
if let problem = problemToDelete {
|
||||||
|
dataManager.deleteProblem(problem)
|
||||||
|
problemToDelete = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} message: {
|
||||||
|
Text(
|
||||||
|
"Are you sure you want to delete this problem? This will also delete all associated attempts."
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
updateFilteredProblems()
|
updateFilteredProblems()
|
||||||
@@ -192,6 +239,51 @@ struct ProblemsView: View {
|
|||||||
.onChange(of: selectedGym) {
|
.onChange(of: selectedGym) {
|
||||||
updateFilteredProblems()
|
updateFilteredProblems()
|
||||||
}
|
}
|
||||||
|
.onChange(of: cachedFilteredProblems) {
|
||||||
|
animationKey += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ViewBuilder
|
||||||
|
private var headerContent: some View {
|
||||||
|
VStack(spacing: 0) {
|
||||||
|
if showingSearch {
|
||||||
|
HStack(spacing: 8) {
|
||||||
|
Image(systemName: "magnifyingglass")
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
.font(.system(size: 16, weight: .medium))
|
||||||
|
|
||||||
|
TextField("Search problems...", text: $searchText)
|
||||||
|
.textFieldStyle(.plain)
|
||||||
|
.font(.system(size: 16))
|
||||||
|
.focused($isSearchFocused)
|
||||||
|
.submitLabel(.search)
|
||||||
|
}
|
||||||
|
.padding(.horizontal, 12)
|
||||||
|
.padding(.vertical, 10)
|
||||||
|
.background {
|
||||||
|
if #available(iOS 18.0, *) {
|
||||||
|
RoundedRectangle(cornerRadius: 12)
|
||||||
|
.fill(.regularMaterial)
|
||||||
|
.overlay {
|
||||||
|
RoundedRectangle(cornerRadius: 12)
|
||||||
|
.stroke(.quaternary, lineWidth: 0.5)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
RoundedRectangle(cornerRadius: 10)
|
||||||
|
.fill(Color(.systemGray6))
|
||||||
|
.overlay {
|
||||||
|
RoundedRectangle(cornerRadius: 10)
|
||||||
|
.stroke(Color(.systemGray4), lineWidth: 0.5)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(.horizontal)
|
||||||
|
.padding(.top, 8)
|
||||||
|
.padding(.bottom, 8)
|
||||||
|
.animation(.easeInOut(duration: 0.3), value: showingSearch)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -300,81 +392,7 @@ struct FilterChip: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ProblemsList: View {
|
|
||||||
let problems: [Problem]
|
|
||||||
@EnvironmentObject var dataManager: ClimbingDataManager
|
|
||||||
@EnvironmentObject var themeManager: ThemeManager
|
|
||||||
@State private var problemToDelete: Problem?
|
|
||||||
@State private var problemToEdit: Problem?
|
|
||||||
@State private var animationKey = 0
|
|
||||||
|
|
||||||
var body: some View {
|
|
||||||
List(problems, id: \.id) { problem in
|
|
||||||
NavigationLink(destination: ProblemDetailView(problemId: problem.id)) {
|
|
||||||
ProblemRow(problem: problem)
|
|
||||||
}
|
|
||||||
.swipeActions(edge: .trailing, allowsFullSwipe: false) {
|
|
||||||
Button(role: .destructive) {
|
|
||||||
problemToDelete = problem
|
|
||||||
} label: {
|
|
||||||
Label("Delete", systemImage: "trash")
|
|
||||||
}
|
|
||||||
|
|
||||||
Button {
|
|
||||||
withAnimation(.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1))
|
|
||||||
{
|
|
||||||
let updatedProblem = problem.updated(isActive: !problem.isActive)
|
|
||||||
dataManager.updateProblem(updatedProblem)
|
|
||||||
}
|
|
||||||
} label: {
|
|
||||||
Label(
|
|
||||||
problem.isActive ? "Mark as Reset" : "Mark as Active",
|
|
||||||
systemImage: problem.isActive ? "xmark.circle" : "checkmark.circle")
|
|
||||||
}
|
|
||||||
.tint(.orange)
|
|
||||||
|
|
||||||
Button {
|
|
||||||
problemToEdit = problem
|
|
||||||
} label: {
|
|
||||||
HStack {
|
|
||||||
Image(systemName: "pencil")
|
|
||||||
Text("Edit")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.tint(themeManager.accentColor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.animation(
|
|
||||||
.spring(response: 0.5, dampingFraction: 0.8, blendDuration: 0.1),
|
|
||||||
value: animationKey
|
|
||||||
)
|
|
||||||
.onChange(of: problems) {
|
|
||||||
animationKey += 1
|
|
||||||
}
|
|
||||||
.listStyle(.plain)
|
|
||||||
.scrollContentBackground(.hidden)
|
|
||||||
.scrollIndicators(.hidden)
|
|
||||||
.clipped()
|
|
||||||
.alert("Delete Problem", isPresented: .constant(problemToDelete != nil)) {
|
|
||||||
Button("Cancel", role: .cancel) {
|
|
||||||
problemToDelete = nil
|
|
||||||
}
|
|
||||||
Button("Delete", role: .destructive) {
|
|
||||||
if let problem = problemToDelete {
|
|
||||||
dataManager.deleteProblem(problem)
|
|
||||||
problemToDelete = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} message: {
|
|
||||||
Text(
|
|
||||||
"Are you sure you want to delete this problem? This will also delete all associated attempts."
|
|
||||||
)
|
|
||||||
}
|
|
||||||
.sheet(item: $problemToEdit) { problem in
|
|
||||||
AddEditProblemView(problemId: problem.id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ProblemRow: View {
|
struct ProblemRow: View {
|
||||||
let problem: Problem
|
let problem: Problem
|
||||||
@@ -528,6 +546,71 @@ struct EmptyProblemsView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct FilterSheet: View {
|
||||||
|
@Binding var selectedClimbType: ClimbType?
|
||||||
|
@Binding var selectedGym: Gym?
|
||||||
|
let filteredProblems: [Problem]
|
||||||
|
@Environment(\.dismiss) var dismiss
|
||||||
|
@EnvironmentObject var themeManager: ThemeManager
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
NavigationStack {
|
||||||
|
ScrollView {
|
||||||
|
FilterSection(
|
||||||
|
selectedClimbType: $selectedClimbType,
|
||||||
|
selectedGym: $selectedGym,
|
||||||
|
filteredProblems: filteredProblems
|
||||||
|
)
|
||||||
|
.padding()
|
||||||
|
}
|
||||||
|
.navigationTitle("Filters")
|
||||||
|
.navigationBarTitleDisplayMode(.inline)
|
||||||
|
.toolbar {
|
||||||
|
ToolbarItem(placement: .navigationBarTrailing) {
|
||||||
|
Button(action: {
|
||||||
|
dismiss()
|
||||||
|
}) {
|
||||||
|
Text("Done")
|
||||||
|
.font(.subheadline)
|
||||||
|
.fontWeight(.semibold)
|
||||||
|
.padding(.horizontal, 16)
|
||||||
|
.padding(.vertical, 6)
|
||||||
|
.background(.ultraThinMaterial)
|
||||||
|
.clipShape(Capsule())
|
||||||
|
.overlay(
|
||||||
|
Capsule()
|
||||||
|
.stroke(Color.secondary.opacity(0.2), lineWidth: 0.5)
|
||||||
|
)
|
||||||
|
.foregroundColor(themeManager.accentColor)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ToolbarItem(placement: .navigationBarLeading) {
|
||||||
|
if selectedClimbType != nil || selectedGym != nil {
|
||||||
|
Button(action: {
|
||||||
|
selectedClimbType = nil
|
||||||
|
selectedGym = nil
|
||||||
|
}) {
|
||||||
|
Text("Reset")
|
||||||
|
.font(.subheadline)
|
||||||
|
.fontWeight(.medium)
|
||||||
|
.padding(.horizontal, 16)
|
||||||
|
.padding(.vertical, 6)
|
||||||
|
.background(.ultraThinMaterial)
|
||||||
|
.clipShape(Capsule())
|
||||||
|
.overlay(
|
||||||
|
Capsule()
|
||||||
|
.stroke(Color.secondary.opacity(0.2), lineWidth: 0.5)
|
||||||
|
)
|
||||||
|
.foregroundColor(.red)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
ProblemsView()
|
ProblemsView()
|
||||||
.environmentObject(ClimbingDataManager.preview)
|
.environmentObject(ClimbingDataManager.preview)
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ struct SessionsList: View {
|
|||||||
{
|
{
|
||||||
Section {
|
Section {
|
||||||
ActiveSessionBanner(session: activeSession, gym: gym)
|
ActiveSessionBanner(session: activeSession, gym: gym)
|
||||||
|
.environmentObject(MusicService.shared)
|
||||||
.padding(.horizontal, 16)
|
.padding(.horizontal, 16)
|
||||||
.listRowInsets(EdgeInsets(top: 16, leading: 0, bottom: 24, trailing: 0))
|
.listRowInsets(EdgeInsets(top: 16, leading: 0, bottom: 24, trailing: 0))
|
||||||
.listRowBackground(Color.clear)
|
.listRowBackground(Color.clear)
|
||||||
@@ -142,6 +143,7 @@ struct SessionsList: View {
|
|||||||
} label: {
|
} label: {
|
||||||
Label("Delete", systemImage: "trash")
|
Label("Delete", systemImage: "trash")
|
||||||
}
|
}
|
||||||
|
.tint(.red)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} header: {
|
} header: {
|
||||||
@@ -178,6 +180,17 @@ struct ActiveSessionBanner: View {
|
|||||||
@EnvironmentObject var dataManager: ClimbingDataManager
|
@EnvironmentObject var dataManager: ClimbingDataManager
|
||||||
@State private var navigateToDetail = false
|
@State private var navigateToDetail = false
|
||||||
|
|
||||||
|
// Access MusicService via DataManager if possible, or EnvironmentObject if injected
|
||||||
|
// Since DataManager holds MusicService, we can access it through there if we expose it or inject it.
|
||||||
|
// In SettingsView we saw .environmentObject(dataManager.musicService).
|
||||||
|
// We should probably inject it here too or access via dataManager if it's public.
|
||||||
|
// Let's check ClimbingDataManager again. It has `let musicService = MusicService.shared`.
|
||||||
|
// But it's not @Published so it won't trigger updates unless we observe the service itself.
|
||||||
|
// The best way is to use @EnvironmentObject var musicService: MusicService
|
||||||
|
// and ensure it's injected in the parent view.
|
||||||
|
|
||||||
|
@EnvironmentObject var musicService: MusicService
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
HStack {
|
HStack {
|
||||||
VStack(alignment: .leading, spacing: 4) {
|
VStack(alignment: .leading, spacing: 4) {
|
||||||
@@ -200,6 +213,19 @@ struct ActiveSessionBanner: View {
|
|||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
.monospacedDigit()
|
.monospacedDigit()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if musicService.isMusicEnabled && musicService.isAuthorized {
|
||||||
|
Button(action: {
|
||||||
|
musicService.togglePlayback()
|
||||||
|
}) {
|
||||||
|
HStack(spacing: 4) {
|
||||||
|
Image(systemName: musicService.isPlaying ? "pause.fill" : "play.fill")
|
||||||
|
.font(.caption)
|
||||||
|
}
|
||||||
|
.foregroundColor(.pink)
|
||||||
|
.padding(.top, 2)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import HealthKit
|
import HealthKit
|
||||||
|
import MusicKit
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
import UniformTypeIdentifiers
|
import UniformTypeIdentifiers
|
||||||
|
|
||||||
@@ -21,6 +22,9 @@ struct SettingsView: View {
|
|||||||
HealthKitSection()
|
HealthKitSection()
|
||||||
.environmentObject(dataManager.healthKitService)
|
.environmentObject(dataManager.healthKitService)
|
||||||
|
|
||||||
|
MusicSection()
|
||||||
|
.environmentObject(dataManager.musicService)
|
||||||
|
|
||||||
AppearanceSection()
|
AppearanceSection()
|
||||||
|
|
||||||
DataManagementSection(
|
DataManagementSection(
|
||||||
@@ -1099,6 +1103,53 @@ struct HealthKitSection: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct MusicSection: View {
|
||||||
|
@EnvironmentObject var musicService: MusicService
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
Section {
|
||||||
|
Toggle(isOn: Binding(
|
||||||
|
get: { musicService.isMusicEnabled },
|
||||||
|
set: { musicService.toggleMusicEnabled($0) }
|
||||||
|
)) {
|
||||||
|
HStack {
|
||||||
|
Image(systemName: "music.note")
|
||||||
|
.foregroundColor(.pink)
|
||||||
|
Text("Apple Music Integration")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if musicService.isMusicEnabled {
|
||||||
|
if !musicService.isAuthorized {
|
||||||
|
Button("Connect Apple Music") {
|
||||||
|
Task {
|
||||||
|
await musicService.checkAuthorizationStatus()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Toggle("Auto-Play on Session Start", isOn: $musicService.isAutoPlayEnabled)
|
||||||
|
Toggle("Stop Music on Session End", isOn: $musicService.isAutoStopEnabled)
|
||||||
|
|
||||||
|
Picker("Playlist", selection: $musicService.selectedPlaylistId) {
|
||||||
|
Text("None").tag(nil as String?)
|
||||||
|
ForEach(musicService.playlists, id: \.id) { playlist in
|
||||||
|
Text(playlist.name).tag(playlist.id.rawValue as String?)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if musicService.isAutoPlayEnabled {
|
||||||
|
Text("Music will only auto-play if headphones are connected when you start a session.")
|
||||||
|
.font(.caption)
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} header: {
|
||||||
|
Text("Music")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
SettingsView()
|
SettingsView()
|
||||||
.environmentObject(ClimbingDataManager.preview)
|
.environmentObject(ClimbingDataManager.preview)
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ struct SessionStatusLiveLiveActivity: Widget {
|
|||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
.lineLimit(1)
|
.lineLimit(1)
|
||||||
}
|
}
|
||||||
|
.padding(.leading, 8)
|
||||||
}
|
}
|
||||||
DynamicIslandExpandedRegion(.trailing) {
|
DynamicIslandExpandedRegion(.trailing) {
|
||||||
VStack(alignment: .trailing, spacing: 4) {
|
VStack(alignment: .trailing, spacing: 4) {
|
||||||
@@ -61,6 +62,7 @@ struct SessionStatusLiveLiveActivity: Widget {
|
|||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.padding(.trailing, 8)
|
||||||
}
|
}
|
||||||
DynamicIslandExpandedRegion(.bottom) {
|
DynamicIslandExpandedRegion(.bottom) {
|
||||||
HStack {
|
HStack {
|
||||||
@@ -72,6 +74,8 @@ struct SessionStatusLiveLiveActivity: Widget {
|
|||||||
.font(.caption2)
|
.font(.caption2)
|
||||||
.foregroundColor(.secondary)
|
.foregroundColor(.secondary)
|
||||||
}
|
}
|
||||||
|
.padding(.horizontal, 12)
|
||||||
|
.padding(.bottom, 4)
|
||||||
}
|
}
|
||||||
} compactLeading: {
|
} compactLeading: {
|
||||||
Image(systemName: "figure.climbing")
|
Image(systemName: "figure.climbing")
|
||||||
|
|||||||
Reference in New Issue
Block a user