WIP: preference to un-hide test/bootstrap profiles

Fixes build within AOSP 14 source tree.

.forgejo/workflows/build-debug.yml

@@ -14,6 +14,7 @@ jobs:
         uses: https://gitea.angry.im/actions/checkout@v3
         with:
           submodules: recursive
+          fetch-depth: 0
 
       - name: Decode Secret Signing Configuration
         uses: https://gitea.angry.im/actions/base64-to-file@v1

.forgejo/workflows/release.yml

@@ -2,10 +2,6 @@ on:
   push:
     tags: '*'
 
-env:
-  # Enable reproducibility-related build system workarounds
-  REPRODUCIBLE_BUILD: true
-
 jobs:
   release:
     runs-on: [docker, android-app-certs]
@@ -17,6 +13,7 @@ jobs:
         uses: https://gitea.angry.im/actions/checkout@v3
         with:
           submodules: recursive
+          fetch-depth: 0
 
       - name: Decode Secret Signing Configuration
         uses: https://gitea.angry.im/actions/base64-to-file@v1
@@ -37,6 +34,9 @@ jobs:
       - name: Build Release APK (Unprivileged / EasyEUICC only)
         run: ./gradlew --no-daemon :app-unpriv:assembleRelease
 
+      - name: Copy Debug Symbols to Release Path
+        run: cp app-unpriv/build/outputs/native-debug-symbols/release/native-debug-symbols.zip app-unpriv/build/outputs/apk/release/
+
       - name: Create Release
         uses: https://gitea.angry.im/actions/forgejo-release@v1
         with:

LICENSE

@@ -1,281 +1,622 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ 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 licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+  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
-this service 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.
+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 make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  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 give the recipients all the rights that
-you have.  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.
+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.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  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.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  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.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  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.
 
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+                       TERMS AND CONDITIONS
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+  0. Definitions.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  "This License" refers to version 3 of the GNU General Public License.
 
-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "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.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  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.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+  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.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  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.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  1. Source Code.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  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.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  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.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  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.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  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.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+  2. Basic Permissions.
 
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  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.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  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.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  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.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+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.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  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.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+  14. Revised Versions of this License.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  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.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  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.
 
-                            NO WARRANTY
+  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.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
+  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
 
@@ -287,15 +628,15 @@ 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
-convey the exclusion of warranty; and each file should have at least
+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.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    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 2 of the License, or
+    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,
@@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found.
     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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    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 is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+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 your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  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/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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.
+  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>.

README.md

@@ -1,20 +1,21 @@
-{Open,Easy}EUICC
----
+<img src="https://gitea.angry.im/PeterCxy/OpenEUICC/media/branch/master/art/OpenEUICCBG.svg" width="512" height="300">
 
 A fully free and open-source Local Profile Assistant implementation for Android devices.
 
 There are two variants of this project:
 
-- OpenEUICC: The full-fledged privileged variant. Intended to be run as a privileged system app (inside `/system/priv-app`) and serve as the system LPA. This can be used to manage all kinds of eSIM chips, embedded or removable.
-  - The privileged variant can be imported to build along with AOSP by simply placing this repository and its [dependencies](https://gitea.angry.im/PeterCxy/android_prebuilts_openeuicc-deps) inside the AOSP tree.
-  - Notes:
-    - This repository contains submodules. If inclusion in `manifest.xml` is required, remember to set the `sync-s` option.
-    - **Only the latest AOSP release** is supported for building. Older versions of AOSP are still compatible with the app itself, but it may not compile within the old AOSP trees. For older versions, consider building the app with `gradle` or a newer AOSP source tree and simply import as a prebuilt apk.
-- EasyEUICC: Unprivileged version that can run as a user app. An eSIM chip must include the certificate of EasyEUICC in its ARA-M field in order to grant access without system privileges. This is intended for removable eSIM chips such as those provided by eSTK.
-  - Prebuilt EasyEUICC apks can be downloaded [here](https://gitea.angry.im/PeterCxy/OpenEUICC/releases)
-  - For removable eSIM chip vendors: to have your chip supported by official builds of EasyEUICC, include the ARA-M hash `2A2FA878BC7C3354C2CF82935A5945A3EDAE4AFA`
+- OpenEUICC: The full-fledged privileged variant.
+  - Due to its privilege requirement, OpenEUICC must be placed inside `/system/priv-app` and be signed with the platform certificate.
+  - The preferred way to including OpenEUICC in a system image is to [build it along with AOSP](#building-aosp).
+  - __Note__: When privileged, OpenEUICC supports any eUICC chip that implements the SGP.22 standard, internal or external. However, there is __no guarantee__ that external (removable) eSIMs actually follow the standard. Please __DO NOT__ submit bug reports for non-functioning removable eSIMs. They are __NOT__ officially supported unless they also support / are supported by EasyEUICC, the unprivileged variant.
+- EasyEUICC: Unprivileged version that can run as a user app.
+  - This version supports two modes of operation:
+    1. Inserted, removable eSIMs: Due to obvious security requirements, EasyEUICC is only able to access eSIM chips whose [ARF/ARA](https://source.android.com/docs/core/connect/uicc#arf) contains the hash of EasyEUICC's signing certificate.
+    2. USB CCID Card Readers: Only `T=0` readers that use the standard [USB CCID protocol](https://en.wikipedia.org/wiki/CCID_(protocol)) are supported. In this mode, EasyEUICC can access any eSIM chip loaded in the card reader regardless of their ARF/ARA, as long as they implement the [SGP.22 standard](https://www.gsma.com/solutions-and-impact/technologies/esim/wp-content/uploads/2021/07/SGP.22-v2.3.pdf).
+  - Prebuilt release-mode EasyEUICC apks can be downloaded [here](https://gitea.angry.im/PeterCxy/OpenEUICC/releases)
+  - For removable eSIM chip vendors: to have your chip supported by official builds of EasyEUICC when inserted, include the ARA-M hash `2A2FA878BC7C3354C2CF82935A5945A3EDAE4AFA`
 
-Building
+Building (Gradle)
 ===
 
 Make sure you have all submodules cloned and updated by running
@@ -48,11 +49,24 @@ For EasyEUICC:
 ./gradlew :app-unpriv:assembleRelease
 ```
 
+Building (AOSP)
+===
+
+There are two ways to include OpenEUICC in your AOSP-based system image:
+
+1. Include this project and its [dependencies](https://gitea.angry.im/PeterCxy/android_prebuilts_openeuicc-deps) inside the AOSP tree.
+   - If inclusion in `manifest.xml` is required, remember to set the `sync-s` option to clone submodules.
+   - The module name is `OpenEUICC`. You can include it in `PRODUCT_PACKAGES`, or simply build it standalone using `mm`.
+   - Compilation of this project is **only** tested against the latest AOSP release version. The app itself should be compatible with older AOSP versions, but the source may not compile against an older AOSP source tree.
+2. If compilation against AOSP source tree is not possible, consider [building with gradle](#building-gradle) and import the apk as a prebuilt.
+   - No official `Android.bp` is provided for this case but it should be straightforward to write.
+   - You might want to include `privapp_whitelist_im.angry.openeuicc.xml` as well.
+
 FAQs
 ===
 
 - Q: Do you provide prebuilt binaries for OpenEUICC?
-- A: No. If you are a custom ROM developer, either include the entire OpenEUICC repository in your AOSP source tree, or generate an APK using `gradle` and import that as a prebuilt system app. Note that you might want `privapp_whitelist_im.angry.openeuicc.xml` as well.
+- A: Debug-mode APKs are available continuously as an artifact of the [Actions](https://gitea.angry.im/PeterCxy/OpenEUICC/actions) CI used by this project. However, these debug-mode APKs are **not** intended for inclusion inside system images, nor are they supported by the developer in any sense. If you are a custom ROM developer, either include the entire OpenEUICC repository in your AOSP source tree, or generate an APK using `gradle` and import that as a prebuilt system app. Note that you might want `privapp_whitelist_im.angry.openeuicc.xml` as well.
 
 - Q: AOSP's Settings app seems to be confused by OpenEUICC (for example, disabling / enabling profiles from the Networks page do not work properly)
 - A: When your device has internal eSIM chip(s) __and__ you have inserted a removable eSIM chip, the Settings app can misbehave since it was never designed for this scenario. __Please prefer using OpenEUICC's own management interface whenever possible.__ In the future, there might be an option to exclude removable SIMs from being reported to the Android system.
@@ -66,12 +80,42 @@ FAQs
 Copyright
 ===
 
+Everything except `libs/lpac-jni` and `art/`:
+
 ```
 Copyright 2022-2024 OpenEUICC contributors
 
-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, version 2.
+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, version 3.
 
-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.
+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/>. 
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ```
+
+`libs/lpac-jni`:
+
+```
+Copyright (C) 2022-2024 OpenEUICC contributiors
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation, version 2.1.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+```
+
+`art/`: Courtesy of [Aikoyori](https://github.com/Aikoyori), CC NC-SA 4.0.

app-common/src/main/AndroidManifest.xml

@@ -6,8 +6,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <application
-        android:networkSecurityConfig="@xml/network_security_config">
+    <application>
         <activity
             android:name="im.angry.openeuicc.ui.SettingsActivity"
             android:label="@string/pref_settings" />
@@ -29,5 +28,9 @@
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
+
+        <service
+            android:name="im.angry.openeuicc.service.EuiccChannelManagerService"
+            android:exported="false" />
     </application>
 </manifest>

app-common/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt

@@ -1,33 +1,19 @@
 package im.angry.openeuicc
 
 import android.app.Application
-import android.telephony.SubscriptionManager
-import android.telephony.TelephonyManager
 import com.google.android.material.color.DynamicColors
-import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.util.PreferenceRepository
+import im.angry.openeuicc.di.AppContainer
+import im.angry.openeuicc.di.DefaultAppContainer
 
 open class OpenEuiccApplication : Application() {
+    open val appContainer: AppContainer by lazy {
+        DefaultAppContainer(this)
+    }
+
     override fun onCreate() {
         super.onCreate()
 
         // Observe dynamic colors changes
         DynamicColors.applyToActivitiesIfAvailable(this)
     }
-
-    val telephonyManager by lazy {
-        getSystemService(TelephonyManager::class.java)!!
-    }
-
-    open val euiccChannelManager: EuiccChannelManager by lazy {
-        EuiccChannelManager(this)
-    }
-
-    val subscriptionManager by lazy {
-        getSystemService(SubscriptionManager::class.java)!!
-    }
-
-    val preferenceRepository by lazy {
-        PreferenceRepository(this)
-    }
 }

app-common/src/main/java/im/angry/openeuicc/core/DefaultEuiccChannelFactory.kt

@@ -0,0 +1,63 @@
+package im.angry.openeuicc.core
+
+import android.content.Context
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbInterface
+import android.hardware.usb.UsbManager
+import android.se.omapi.SEService
+import android.util.Log
+import im.angry.openeuicc.core.usb.UsbApduInterface
+import im.angry.openeuicc.core.usb.getIoEndpoints
+import im.angry.openeuicc.util.*
+import java.lang.IllegalArgumentException
+
+open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccChannelFactory {
+    private var seService: SEService? = null
+
+    private val usbManager by lazy {
+        context.getSystemService(Context.USB_SERVICE) as UsbManager
+    }
+
+    private suspend fun ensureSEService() {
+        if (seService == null || !seService!!.isConnected) {
+            seService = connectSEService(context)
+        }
+    }
+
+    override suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel? {
+        if (port.portIndex != 0) {
+            Log.w(DefaultEuiccChannelManager.TAG, "OMAPI channel attempted on non-zero portId, this may or may not work.")
+        }
+
+        ensureSEService()
+
+        Log.i(DefaultEuiccChannelManager.TAG, "Trying OMAPI for physical slot ${port.card.physicalSlotIndex}")
+        try {
+            return EuiccChannel(port, OmapiApduInterface(seService!!, port))
+        } catch (e: IllegalArgumentException) {
+            // Failed
+            Log.w(
+                DefaultEuiccChannelManager.TAG,
+                "OMAPI APDU interface unavailable for physical slot ${port.card.physicalSlotIndex}."
+            )
+        }
+
+        return null
+    }
+
+    override fun tryOpenUsbEuiccChannel(usbDevice: UsbDevice, usbInterface: UsbInterface): EuiccChannel? {
+        val (bulkIn, bulkOut) = usbInterface.getIoEndpoints()
+        if (bulkIn == null || bulkOut == null) return null
+        val conn = usbManager.openDevice(usbDevice) ?: return null
+        if (!conn.claimInterface(usbInterface, true)) return null
+        return EuiccChannel(
+            FakeUiccPortInfoCompat(FakeUiccCardInfoCompat(EuiccChannelManager.USB_CHANNEL_ID)),
+            UsbApduInterface(conn, bulkIn, bulkOut)
+        )
+    }
+
+    override fun cleanup() {
+        seService?.shutdown()
+        seService = null
+    }
+}

app-common/src/main/java/im/angry/openeuicc/core/DefaultEuiccChannelManager.kt

@@ -0,0 +1,235 @@
+package im.angry.openeuicc.core
+
+import android.content.Context
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbManager
+import android.telephony.SubscriptionManager
+import android.util.Log
+import im.angry.openeuicc.core.usb.getSmartCardInterface
+import im.angry.openeuicc.di.AppContainer
+import im.angry.openeuicc.util.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+
+open class DefaultEuiccChannelManager(
+    protected val appContainer: AppContainer,
+    protected val context: Context
+) : EuiccChannelManager {
+    companion object {
+        const val TAG = "EuiccChannelManager"
+    }
+
+    private val channelCache = mutableListOf<EuiccChannel>()
+
+    private var usbChannel: EuiccChannel? = null
+
+    private val lock = Mutex()
+
+    protected val tm by lazy {
+        appContainer.telephonyManager
+    }
+
+    private val usbManager by lazy {
+        context.getSystemService(Context.USB_SERVICE) as UsbManager
+    }
+
+    private val euiccChannelFactory by lazy {
+        appContainer.euiccChannelFactory
+    }
+
+    protected open val uiccCards: Collection<UiccCardInfoCompat>
+        get() = (0..<tm.activeModemCountCompat).map { FakeUiccCardInfoCompat(it) }
+
+    private suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel? {
+        lock.withLock {
+            if (port.card.physicalSlotIndex == EuiccChannelManager.USB_CHANNEL_ID) {
+                return if (usbChannel != null && usbChannel!!.valid) {
+                    usbChannel
+                } else {
+                    usbChannel = null
+                    null
+                }
+            }
+
+            val existing =
+                channelCache.find { it.slotId == port.card.physicalSlotIndex && it.portId == port.portIndex }
+            if (existing != null) {
+                if (existing.valid && port.logicalSlotIndex == existing.logicalSlotId) {
+                    return existing
+                } else {
+                    existing.close()
+                    channelCache.remove(existing)
+                }
+            }
+
+            if (port.logicalSlotIndex == SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
+                // We can only open channels on ports that are actually enabled
+                return null
+            }
+
+            val channel = euiccChannelFactory.tryOpenEuiccChannel(port) ?: return null
+
+            if (channel.valid) {
+                channelCache.add(channel)
+                return channel
+            } else {
+                Log.i(
+                    TAG,
+                    "Was able to open channel for logical slot ${port.logicalSlotIndex}, but the channel is invalid (cannot get eID or profiles without errors). This slot might be broken, aborting."
+                )
+                channel.close()
+                return null
+            }
+        }
+    }
+
+    override fun findEuiccChannelBySlotBlocking(logicalSlotId: Int): EuiccChannel? =
+        runBlocking {
+            withContext(Dispatchers.IO) {
+                if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+                    return@withContext usbChannel
+                }
+
+                for (card in uiccCards) {
+                    for (port in card.ports) {
+                        if (port.logicalSlotIndex == logicalSlotId) {
+                            return@withContext tryOpenEuiccChannel(port)
+                        }
+                    }
+                }
+
+                null
+            }
+        }
+
+    override fun findEuiccChannelByPhysicalSlotBlocking(physicalSlotId: Int): EuiccChannel? =
+        runBlocking {
+            withContext(Dispatchers.IO) {
+                if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+                    return@withContext usbChannel
+                }
+
+                for (card in uiccCards) {
+                    if (card.physicalSlotIndex != physicalSlotId) continue
+                    for (port in card.ports) {
+                        tryOpenEuiccChannel(port)?.let { return@withContext it }
+                    }
+                }
+
+                null
+            }
+        }
+
+    override suspend fun findAllEuiccChannelsByPhysicalSlot(physicalSlotId: Int): List<EuiccChannel>? {
+        if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+            return usbChannel?.let { listOf(it) }
+        }
+
+        for (card in uiccCards) {
+            if (card.physicalSlotIndex != physicalSlotId) continue
+            return card.ports.mapNotNull { tryOpenEuiccChannel(it) }
+                .ifEmpty { null }
+        }
+        return null
+    }
+
+    override fun findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId: Int): List<EuiccChannel>? =
+        runBlocking {
+            findAllEuiccChannelsByPhysicalSlot(physicalSlotId)
+        }
+
+    override suspend fun findEuiccChannelByPort(physicalSlotId: Int, portId: Int): EuiccChannel? =
+        withContext(Dispatchers.IO) {
+            if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+                return@withContext usbChannel
+            }
+
+            uiccCards.find { it.physicalSlotIndex == physicalSlotId }?.let { card ->
+                card.ports.find { it.portIndex == portId }?.let { tryOpenEuiccChannel(it) }
+            }
+        }
+
+    override fun findEuiccChannelByPortBlocking(physicalSlotId: Int, portId: Int): EuiccChannel? =
+        runBlocking {
+            findEuiccChannelByPort(physicalSlotId, portId)
+        }
+
+    override suspend fun waitForReconnect(physicalSlotId: Int, portId: Int, timeoutMillis: Long) {
+        if (physicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) return
+
+        // If there is already a valid channel, we close it proactively
+        // Sometimes the current channel can linger on for a bit even after it should have become invalid
+        channelCache.find { it.slotId == physicalSlotId && it.portId == portId }?.apply {
+            if (valid) close()
+        }
+
+        withTimeout(timeoutMillis) {
+            while (true) {
+                try {
+                    // tryOpenEuiccChannel() will automatically dispose of invalid channels
+                    // and recreate when needed
+                    val channel = findEuiccChannelByPortBlocking(physicalSlotId, portId)!!
+                    check(channel.valid) { "Invalid channel" }
+                    break
+                } catch (e: Exception) {
+                    Log.d(TAG, "Slot $physicalSlotId port $portId reconnect failure, retrying in 1000 ms")
+                }
+                delay(1000)
+            }
+        }
+    }
+
+    override suspend fun enumerateEuiccChannels(): List<EuiccChannel> =
+        withContext(Dispatchers.IO) {
+            uiccCards.flatMap { info ->
+                info.ports.mapNotNull { port ->
+                    tryOpenEuiccChannel(port)?.also {
+                        Log.d(
+                            TAG,
+                            "Found eUICC on slot ${info.physicalSlotIndex} port ${port.portIndex}"
+                        )
+                    }
+                }
+            }
+        }
+
+    override suspend fun enumerateUsbEuiccChannel(): Pair<UsbDevice?, EuiccChannel?> =
+        withContext(Dispatchers.IO) {
+            usbManager.deviceList.values.forEach { device ->
+                Log.i(TAG, "Scanning USB device ${device.deviceId}:${device.vendorId}")
+                val iface = device.getSmartCardInterface() ?: return@forEach
+                // If we don't have permission, tell UI code that we found a candidate device, but we
+                // need permission to be able to do anything with it
+                if (!usbManager.hasPermission(device)) return@withContext Pair(device, null)
+                Log.i(TAG, "Found CCID interface on ${device.deviceId}:${device.vendorId}, and has permission; trying to open channel")
+                try {
+                    val channel = euiccChannelFactory.tryOpenUsbEuiccChannel(device, iface)
+                    if (channel != null && channel.lpa.valid) {
+                        usbChannel = channel
+                        return@withContext Pair(device, channel)
+                    }
+                } catch (e: Exception) {
+                    // Ignored -- skip forward
+                    e.printStackTrace()
+                }
+                Log.i(TAG, "No valid eUICC channel found on USB device ${device.deviceId}:${device.vendorId}")
+            }
+            return@withContext Pair(null, null)
+        }
+
+    override fun invalidate() {
+        for (channel in channelCache) {
+            channel.close()
+        }
+
+        usbChannel?.close()
+        usbChannel = null
+        channelCache.clear()
+        euiccChannelFactory.cleanup()
+    }
+}

app-common/src/main/java/im/angry/openeuicc/core/DefaultEuiccChannelManagerFactory.kt

@@ -0,0 +1,10 @@
+package im.angry.openeuicc.core
+
+import android.app.Service
+import im.angry.openeuicc.di.AppContainer
+
+class DefaultEuiccChannelManagerFactory(private val appContainer: AppContainer) :
+    EuiccChannelManagerFactory {
+    override fun createEuiccChannelManager(serviceContext: Service) =
+        DefaultEuiccChannelManager(appContainer, serviceContext)
+}

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt

@@ -1,16 +1,21 @@
 package im.angry.openeuicc.core
 
 import im.angry.openeuicc.util.*
+import net.typeblog.lpac_jni.ApduInterface
 import net.typeblog.lpac_jni.LocalProfileAssistant
+import net.typeblog.lpac_jni.impl.HttpInterfaceImpl
+import net.typeblog.lpac_jni.impl.LocalProfileAssistantImpl
 
-abstract class EuiccChannel(
-    val port: UiccPortInfoCompat
+class EuiccChannel(
+    val port: UiccPortInfoCompat,
+    apduInterface: ApduInterface,
 ) {
     val slotId = port.card.physicalSlotIndex // PHYSICAL slot
     val logicalSlotId = port.logicalSlotIndex
     val portId = port.portIndex
 
-    abstract val lpa: LocalProfileAssistant
+    val lpa: LocalProfileAssistant = LocalProfileAssistantImpl(apduInterface, HttpInterfaceImpl())
+
     val valid: Boolean
         get() = lpa.valid
 

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelFactory.kt

@@ -0,0 +1,20 @@
+package im.angry.openeuicc.core
+
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbInterface
+import im.angry.openeuicc.util.*
+
+// This class is here instead of inside DI because it contains a bit more logic than just
+// "dumb" dependency injection.
+interface EuiccChannelFactory {
+    suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel?
+
+    fun tryOpenUsbEuiccChannel(usbDevice: UsbDevice, usbInterface: UsbInterface): EuiccChannel?
+
+    /**
+     * Release all resources used by this EuiccChannelFactory
+     * Note that the same instance may be reused; any resources allocated must be automatically
+     * re-acquired when this happens
+     */
+    fun cleanup()
+}

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt

@@ -1,168 +1,80 @@
 package im.angry.openeuicc.core
 
-import android.content.Context
-import android.se.omapi.SEService
-import android.telephony.SubscriptionManager
-import android.util.Log
-import im.angry.openeuicc.OpenEuiccApplication
-import im.angry.openeuicc.util.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import java.lang.IllegalArgumentException
+import android.hardware.usb.UsbDevice
 
-open class EuiccChannelManager(protected val context: Context) {
+/**
+ * EuiccChannelManager holds references to, and manages the lifecycles of, individual
+ * APDU channels to SIM cards. The find* methods will create channels when needed, and
+ * all opened channels will be held in an internal cache until invalidate() is called
+ * or when this instance is destroyed.
+ *
+ * To precisely control the lifecycle of this object itself (and thus its cached channels),
+ * all other compoents must access EuiccChannelManager objects through EuiccChannelManagerService.
+ * Holding references independent of EuiccChannelManagerService is unsupported.
+ */
+interface EuiccChannelManager {
     companion object {
-        const val TAG = "EuiccChannelManager"
+        const val USB_CHANNEL_ID = 99
     }
 
-    private val channels = mutableListOf<EuiccChannel>()
+    /**
+     * Scan all possible _device internal_ sources for EuiccChannels, return them and have all
+     * scanned channels cached; these channels will remain open for the entire lifetime of
+     * this EuiccChannelManager object, unless disconnected externally or invalidate()'d
+     */
+    suspend fun enumerateEuiccChannels(): List<EuiccChannel>
 
-    private var seService: SEService? = null
+    /**
+     * Scan all possible USB devices for CCID readers that may contain eUICC cards.
+     * If found, try to open it for access, and add it to the internal EuiccChannel cache
+     * as a "port" with id 99. When user interaction is required to obtain permission
+     * to interact with the device, the second return value (EuiccChannel) will be null.
+     */
+    suspend fun enumerateUsbEuiccChannel(): Pair<UsbDevice?, EuiccChannel?>
 
-    private val lock = Mutex()
+    /**
+     * Wait for a slot + port to reconnect (i.e. become valid again)
+     * If the port is currently valid, this function will return immediately.
+     * On timeout, the caller can decide to either try again later, or alert the user with an error
+     */
+    suspend fun waitForReconnect(physicalSlotId: Int, portId: Int, timeoutMillis: Long = 1000)
 
-    protected val tm by lazy {
-        (context.applicationContext as OpenEuiccApplication).telephonyManager
-    }
+    /**
+     * Returns the EuiccChannel corresponding to a **logical** slot
+     */
+    fun findEuiccChannelBySlotBlocking(logicalSlotId: Int): EuiccChannel?
 
-    protected open val uiccCards: Collection<UiccCardInfoCompat>
-        get() = (0..<tm.activeModemCountCompat).map { FakeUiccCardInfoCompat(it) }
+    /**
+     * Returns the first EuiccChannel corresponding to a **physical** slot
+     * If the physical slot supports MEP and has multiple ports, it is undefined
+     * which of the two channels will be returned.
+     */
+    fun findEuiccChannelByPhysicalSlotBlocking(physicalSlotId: Int): EuiccChannel?
 
-    private suspend fun ensureSEService() {
-         if (seService == null) {
-             seService = connectSEService(context)
-         }
-    }
+    /**
+     * Returns all EuiccChannels corresponding to a **physical** slot
+     * Multiple channels are possible in the case of MEP
+     */
+    suspend fun findAllEuiccChannelsByPhysicalSlot(physicalSlotId: Int): List<EuiccChannel>?
+    fun findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId: Int): List<EuiccChannel>?
 
-    protected open fun tryOpenEuiccChannelPrivileged(port: UiccPortInfoCompat): EuiccChannel? {
-        // No-op when unprivileged
-        return null
-    }
+    /**
+     * Returns the EuiccChannel corresponding to a **physical** slot and a port ID
+     */
+    suspend fun findEuiccChannelByPort(physicalSlotId: Int, portId: Int): EuiccChannel?
+    fun findEuiccChannelByPortBlocking(physicalSlotId: Int, portId: Int): EuiccChannel?
 
-    protected fun tryOpenEuiccChannelUnprivileged(port: UiccPortInfoCompat): EuiccChannel? {
-        if (port.portIndex != 0) {
-            Log.w(TAG, "OMAPI channel attempted on non-zero portId, this may or may not work.")
-        }
+    /**
+     * Invalidate all EuiccChannels previously cached by this Manager
+     */
+    fun invalidate()
 
-        Log.i(TAG, "Trying OMAPI for physical slot ${port.card.physicalSlotIndex}")
-        try {
-            return OmapiChannel(seService!!, port)
-        } catch (e: IllegalArgumentException) {
-            // Failed
-            Log.w(TAG, "OMAPI APDU interface unavailable for physical slot ${port.card.physicalSlotIndex}.")
-        }
-
-        return null
-    }
-
-    private suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel? {
-        lock.withLock {
-            ensureSEService()
-            val existing = channels.find { it.slotId == port.card.physicalSlotIndex && it.portId == port.portIndex }
-            if (existing != null) {
-                if (existing.valid && port.logicalSlotIndex == existing.logicalSlotId) {
-                    return existing
-                } else {
-                    existing.close()
-                    channels.remove(existing)
-                }
-            }
-
-            if (port.logicalSlotIndex == SubscriptionManager.INVALID_SIM_SLOT_INDEX) {
-                // We can only open channels on ports that are actually enabled
-                return null
-            }
-
-            var euiccChannel: EuiccChannel? = tryOpenEuiccChannelPrivileged(port)
-
-            if (euiccChannel == null) {
-                euiccChannel = tryOpenEuiccChannelUnprivileged(port)
-            }
-
-            if (euiccChannel != null) {
-                channels.add(euiccChannel)
-            }
-
-            return euiccChannel
-        }
-    }
-
-    fun findEuiccChannelBySlotBlocking(logicalSlotId: Int): EuiccChannel? =
-        runBlocking {
-            withContext(Dispatchers.IO) {
-                for (card in uiccCards) {
-                    for (port in card.ports) {
-                        if (port.logicalSlotIndex == logicalSlotId) {
-                            return@withContext tryOpenEuiccChannel(port)
-                        }
-                    }
-                }
-
-                null
-            }
-        }
-
-    fun findEuiccChannelByPhysicalSlotBlocking(physicalSlotId: Int): EuiccChannel? = runBlocking {
-        withContext(Dispatchers.IO) {
-            for (card in uiccCards) {
-                if (card.physicalSlotIndex != physicalSlotId) continue
-                for (port in card.ports) {
-                    tryOpenEuiccChannel(port)?.let { return@withContext it }
-                }
-            }
-
-            null
-        }
-    }
-
-    fun findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId: Int): List<EuiccChannel>? = runBlocking {
-        for (card in uiccCards) {
-            if (card.physicalSlotIndex != physicalSlotId) continue
-            return@runBlocking card.ports.mapNotNull { tryOpenEuiccChannel(it) }
-                .ifEmpty { null }
-        }
-        return@runBlocking null
-    }
-
-    fun findEuiccChannelByPortBlocking(physicalSlotId: Int, portId: Int): EuiccChannel? = runBlocking {
-        withContext(Dispatchers.IO) {
-            uiccCards.find { it.physicalSlotIndex == physicalSlotId }?.let { card ->
-                card.ports.find { it.portIndex == portId }?.let { tryOpenEuiccChannel(it) }
-            }
-        }
-    }
-
-    suspend fun enumerateEuiccChannels() {
-        withContext(Dispatchers.IO) {
-            ensureSEService()
-
-            for (uiccInfo in uiccCards) {
-                for (port in uiccInfo.ports) {
-                    if (tryOpenEuiccChannel(port) != null) {
-                        Log.d(TAG, "Found eUICC on slot ${uiccInfo.physicalSlotIndex} port ${port.portIndex}")
-                    }
-                }
-            }
-        }
-    }
-
-    val knownChannels: List<EuiccChannel>
-        get() = channels.toList()
-
-    fun invalidate() {
-        for (channel in channels) {
-            channel.close()
-        }
-
-        channels.clear()
-        seService?.shutdown()
-        seService = null
-    }
-
-    open fun notifyEuiccProfilesChanged(logicalSlotId: Int) {
-        // No-op for unprivileged
+    /**
+     * If possible, trigger the system to update the cached list of profiles
+     * This is only expected to be implemented when the application is privileged
+     * TODO: Remove this from the common interface
+     */
+    fun notifyEuiccProfilesChanged(logicalSlotId: Int) {
+        // no-op by default
     }
 }

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManagerFactory.kt

@@ -0,0 +1,7 @@
+package im.angry.openeuicc.core
+
+import android.app.Service
+
+interface EuiccChannelManagerFactory {
+    fun createEuiccChannelManager(serviceContext: Service): EuiccChannelManager
+}

app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt

@@ -3,19 +3,24 @@ package im.angry.openeuicc.core
 import android.se.omapi.Channel
 import android.se.omapi.SEService
 import android.se.omapi.Session
+import android.util.Log
 import im.angry.openeuicc.util.*
 import net.typeblog.lpac_jni.ApduInterface
-import net.typeblog.lpac_jni.LocalProfileAssistant
-import net.typeblog.lpac_jni.impl.HttpInterfaceImpl
-import net.typeblog.lpac_jni.impl.LocalProfileAssistantImpl
 
 class OmapiApduInterface(
     private val service: SEService,
     private val port: UiccPortInfoCompat
 ): ApduInterface {
+    companion object {
+        const val TAG = "OmapiApduInterface"
+    }
+
     private lateinit var session: Session
     private lateinit var lastChannel: Channel
 
+    override val valid: Boolean
+        get() = service.isConnected && (this::session.isInitialized && !session.isClosed)
+
     override fun connect() {
         session = service.getUiccReaderCompat(port.logicalSlotIndex + 1).openSession()
     }
@@ -44,16 +49,17 @@ class OmapiApduInterface(
             "Unknown channel"
         }
 
-        return lastChannel.transmit(tx)
+        Log.d(TAG, "OMAPI APDU: ${tx.encodeHex()}")
+
+        try {
+            return lastChannel.transmit(tx).also {
+                Log.d(TAG, "OMAPI APDU response: ${it.encodeHex()}")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "OMAPI APDU exception")
+            e.printStackTrace()
+            throw e
+        }
     }
 
 }
-
-class OmapiChannel(
-    service: SEService,
-    port: UiccPortInfoCompat,
-) : EuiccChannel(port) {
-    override val lpa: LocalProfileAssistant = LocalProfileAssistantImpl(
-        OmapiApduInterface(service, port),
-        HttpInterfaceImpl())
-}

app-common/src/main/java/im/angry/openeuicc/core/usb/UsbApduInterface.kt

@@ -0,0 +1,165 @@
+package im.angry.openeuicc.core.usb
+
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbEndpoint
+import android.util.Log
+import im.angry.openeuicc.util.*
+import net.typeblog.lpac_jni.ApduInterface
+
+class UsbApduInterface(
+    private val conn: UsbDeviceConnection,
+    private val bulkIn: UsbEndpoint,
+    private val bulkOut: UsbEndpoint
+): ApduInterface {
+    companion object {
+        private const val TAG = "UsbApduInterface"
+    }
+
+    private lateinit var ccidDescription: UsbCcidDescription
+    private lateinit var transceiver: UsbCcidTransceiver
+
+    private var channelId = -1
+
+    override fun connect() {
+        ccidDescription = UsbCcidDescription.fromRawDescriptors(conn.rawDescriptors)!!
+
+        if (!ccidDescription.hasT0Protocol) {
+            throw IllegalArgumentException("Unsupported card reader; T=0 support is required")
+        }
+
+        transceiver = UsbCcidTransceiver(conn, bulkIn, bulkOut, ccidDescription)
+
+        try {
+            transceiver.iccPowerOn()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            throw e
+        }
+    }
+
+    override fun disconnect() {
+        conn.close()
+    }
+
+    override fun logicalChannelOpen(aid: ByteArray): Int {
+        check(channelId == -1) { "Logical channel already opened" }
+
+        // OPEN LOGICAL CHANNEL
+        val req = manageChannelCmd(true, 0)
+
+        val resp = try {
+            transmitApduByChannel(req, 0)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            return -1
+        }
+
+        if (!isSuccessResponse(resp)) {
+            Log.d(TAG, "OPEN LOGICAL CHANNEL failed: ${resp.encodeHex()}")
+            return -1
+        }
+
+        channelId = resp[0].toInt()
+        Log.d(TAG, "channelId = $channelId")
+
+        // Then, select AID
+        val selectAid = selectByDfCmd(aid, channelId.toByte())
+        val selectAidResp = transmitApduByChannel(selectAid, channelId.toByte())
+
+        if (!isSuccessResponse(selectAidResp)) {
+            Log.d(TAG, "Select DF failed : ${selectAidResp.encodeHex()}")
+            return -1
+        }
+
+        return channelId
+    }
+
+    override fun logicalChannelClose(handle: Int) {
+        check(handle == channelId) { "Logical channel ID mismatch" }
+        check(channelId != -1) { "Logical channel is not opened" }
+
+        // CLOSE LOGICAL CHANNEL
+        val req = manageChannelCmd(false, channelId.toByte())
+        val resp = transmitApduByChannel(req, channelId.toByte())
+
+        if (!isSuccessResponse(resp)) {
+            Log.d(TAG, "CLOSE LOGICAL CHANNEL failed: ${resp.encodeHex()}")
+        }
+
+        channelId = -1
+    }
+
+    override fun transmit(tx: ByteArray): ByteArray {
+        check(channelId != -1) { "Logical channel is not opened" }
+        return transmitApduByChannel(tx, channelId.toByte())
+    }
+
+    override val valid: Boolean
+        get() = channelId != -1
+
+    private fun isSuccessResponse(resp: ByteArray): Boolean =
+        resp.size >= 2 && resp[resp.size - 2] == 0x90.toByte() && resp[resp.size - 1] == 0x00.toByte()
+
+    private fun buildCmd(cla: Byte, ins: Byte, p1: Byte, p2: Byte, data: ByteArray?, le: Byte?) =
+        byteArrayOf(cla, ins, p1, p2).let {
+            if (data != null) {
+                it + data.size.toByte() + data
+            } else {
+                it
+            }
+        }.let {
+            if (le != null) {
+                it + byteArrayOf(le)
+            } else {
+                it
+            }
+        }
+
+    private fun manageChannelCmd(open: Boolean, channel: Byte) =
+        if (open) {
+            buildCmd(0x00, 0x70, 0x00, 0x00, null, 0x01)
+        } else {
+            buildCmd(channel, 0x70, 0x80.toByte(), channel, null, null)
+        }
+
+    private fun selectByDfCmd(aid: ByteArray, channel: Byte) =
+        buildCmd(channel, 0xA4.toByte(), 0x04, 0x00, aid, null)
+
+    private fun transmitApduByChannel(tx: ByteArray, channel: Byte): ByteArray {
+        val realTx = tx.copyOf()
+        // OR the channel mask into the CLA byte
+        realTx[0] = ((realTx[0].toInt() and 0xFC) or channel.toInt()).toByte()
+
+        var resp = transceiver.sendXfrBlock(realTx).data!!
+
+        if (resp.size < 2) throw RuntimeException("APDU response smaller than 2 (sw1 + sw2)!")
+
+        var sw1 = resp[resp.size - 2].toInt() and 0xFF
+        var sw2 = resp[resp.size - 1].toInt() and 0xFF
+
+        if (sw1 == 0x6C) {
+            // 0x6C = wrong le
+            // so we fix the le field here
+            realTx[realTx.size - 1] = resp[resp.size - 1]
+            resp = transceiver.sendXfrBlock(realTx).data!!
+        } else if (sw1 == 0x61) {
+            // 0x61 = X bytes available
+            // continue reading by GET RESPONSE
+            do {
+                // GET RESPONSE
+                val getResponseCmd = byteArrayOf(
+                    realTx[0], 0xC0.toByte(), 0x00, 0x00, sw2.toByte()
+                )
+
+                val tmp = transceiver.sendXfrBlock(getResponseCmd).data!!
+
+                resp = resp.sliceArray(0 until (resp.size - 2)) + tmp
+
+                sw1 = resp[resp.size - 2].toInt() and 0xFF
+                sw2 = resp[resp.size - 1].toInt() and 0xFF
+            } while (sw1 == 0x61)
+        }
+
+        return resp
+    }
+}

app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidDescription.kt

@@ -0,0 +1,105 @@
+package im.angry.openeuicc.core.usb
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+@Suppress("unused")
+data class UsbCcidDescription(
+    private val bMaxSlotIndex: Byte,
+    private val bVoltageSupport: Byte,
+    private val dwProtocols: Int,
+    private val dwFeatures: Int
+) {
+    companion object {
+        private const val DESCRIPTOR_LENGTH: Byte = 0x36
+        private const val DESCRIPTOR_TYPE: Byte = 0x21
+
+        // dwFeatures Masks
+        private const val FEATURE_AUTOMATIC_VOLTAGE = 0x00008
+        private const val FEATURE_AUTOMATIC_PPS = 0x00080
+
+        private const val FEATURE_EXCHANGE_LEVEL_TPDU = 0x10000
+        private const val FEATURE_EXCHANGE_LEVEL_SHORT_APDU = 0x20000
+        private const val FEATURE_EXCHAGE_LEVEL_EXTENDED_APDU = 0x40000
+
+        // bVoltageSupport Masks
+        private const val VOLTAGE_5V: Byte = 1
+        private const val VOLTAGE_3V: Byte = 2
+        private const val VOLTAGE_1_8V: Byte = 4
+
+        private const val SLOT_OFFSET = 4
+        private const val FEATURES_OFFSET = 40
+        private const val MASK_T0_PROTO = 1
+        private const val MASK_T1_PROTO = 2
+
+        fun fromRawDescriptors(desc: ByteArray): UsbCcidDescription? {
+            var dwProtocols = 0
+            var dwFeatures = 0
+            var bMaxSlotIndex: Byte = 0
+            var bVoltageSupport: Byte = 0
+
+            var hasCcidDescriptor = false
+
+            val byteBuffer = ByteBuffer.wrap(desc).order(ByteOrder.LITTLE_ENDIAN)
+
+            while (byteBuffer.hasRemaining()) {
+                byteBuffer.mark()
+                val len = byteBuffer.get()
+                val type = byteBuffer.get()
+                if (type == DESCRIPTOR_TYPE && len == DESCRIPTOR_LENGTH) {
+                    byteBuffer.reset()
+                    byteBuffer.position(byteBuffer.position() + SLOT_OFFSET)
+                    bMaxSlotIndex = byteBuffer.get()
+                    bVoltageSupport = byteBuffer.get()
+                    dwProtocols = byteBuffer.int
+                    byteBuffer.reset()
+                    byteBuffer.position(byteBuffer.position() + FEATURES_OFFSET)
+                    dwFeatures = byteBuffer.int
+                    hasCcidDescriptor = true
+                    break
+                } else {
+                    byteBuffer.position(byteBuffer.position() + len - 2)
+                }
+            }
+
+            return if (hasCcidDescriptor) {
+                UsbCcidDescription(bMaxSlotIndex, bVoltageSupport, dwProtocols, dwFeatures)
+            } else {
+                null
+            }
+        }
+    }
+
+    enum class Voltage(powerOnValue: Int, mask: Int) {
+        AUTO(0, 0), _5V(1, VOLTAGE_5V.toInt()), _3V(2, VOLTAGE_3V.toInt()), _1_8V(
+            3,
+            VOLTAGE_1_8V.toInt()
+        );
+
+        val mask = powerOnValue.toByte()
+        val powerOnValue = mask.toByte()
+    }
+
+    private fun hasFeature(feature: Int): Boolean =
+        (dwFeatures and feature) != 0
+
+    val voltages: Array<Voltage>
+        get() =
+            if (hasFeature(FEATURE_AUTOMATIC_VOLTAGE)) {
+                arrayOf(Voltage.AUTO)
+            } else {
+                Voltage.values().mapNotNull {
+                    if ((it.mask.toInt() and bVoltageSupport.toInt()) != 0) {
+                        it
+                    } else {
+                        null
+                    }
+                }.toTypedArray()
+            }
+
+    val hasAutomaticPps: Boolean
+        get() = hasFeature(FEATURE_AUTOMATIC_PPS)
+
+    val hasT0Protocol: Boolean
+        get() = (dwProtocols and MASK_T0_PROTO) != 0
+}

app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidTransceiver.kt

@@ -0,0 +1,342 @@
+package im.angry.openeuicc.core.usb
+
+import android.hardware.usb.UsbDeviceConnection
+import android.hardware.usb.UsbEndpoint
+import android.os.SystemClock
+import android.util.Log
+import im.angry.openeuicc.util.*
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+
+/**
+ * Provides raw, APDU-agnostic transmission to the CCID reader
+ * Adapted from <https://github.com/open-keychain/open-keychain/blob/master/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb/CcidTransceiver.java>
+ */
+@Suppress("unused")
+class UsbCcidTransceiver(
+    private val usbConnection: UsbDeviceConnection,
+    private val usbBulkIn: UsbEndpoint,
+    private val usbBulkOut: UsbEndpoint,
+    private val usbCcidDescription: UsbCcidDescription
+) {
+    companion object {
+        private const val TAG = "UsbCcidTransceiver"
+
+        private const val CCID_HEADER_LENGTH = 10
+
+        private const val MESSAGE_TYPE_RDR_TO_PC_DATA_BLOCK = 0x80
+        private const val MESSAGE_TYPE_PC_TO_RDR_ICC_POWER_ON = 0x62
+        private const val MESSAGE_TYPE_PC_TO_RDR_ICC_POWER_OFF = 0x63
+        private const val MESSAGE_TYPE_PC_TO_RDR_XFR_BLOCK = 0x6f
+
+        private const val COMMAND_STATUS_SUCCESS: Byte = 0
+        private const val COMMAND_STATUS_TIME_EXTENSION_RQUESTED: Byte = 2
+
+        /**
+         * Level Parameter: APDU is a single command.
+         *
+         * "the command APDU begins and ends with this command"
+         * -- DWG Smart-Card USB Integrated Circuit(s) Card Devices rev 1.0
+         * § 6.1.1.3
+         */
+        const val LEVEL_PARAM_START_SINGLE_CMD_APDU: Short = 0x0000
+
+        /**
+         * Level Parameter: First APDU in a multi-command APDU.
+         *
+         * "the command APDU begins with this command, and continue in the
+         * next PC_to_RDR_XfrBlock"
+         * -- DWG Smart-Card USB Integrated Circuit(s) Card Devices rev 1.0
+         * § 6.1.1.3
+         */
+        const val LEVEL_PARAM_START_MULTI_CMD_APDU: Short = 0x0001
+
+        /**
+         * Level Parameter: Final APDU in a multi-command APDU.
+         *
+         * "this abData field continues a command APDU and ends the command APDU"
+         * -- DWG Smart-Card USB Integrated Circuit(s) Card Devices rev 1.0
+         * § 6.1.1.3
+         */
+        const val LEVEL_PARAM_END_MULTI_CMD_APDU: Short = 0x0002
+
+        /**
+         * Level Parameter: Next command in a multi-command APDU.
+         *
+         * "the abData field continues a command APDU and another block is to follow"
+         * -- DWG Smart-Card USB Integrated Circuit(s) Card Devices rev 1.0
+         * § 6.1.1.3
+         */
+        const val LEVEL_PARAM_CONTINUE_MULTI_CMD_APDU: Short = 0x0003
+
+        /**
+         * Level Parameter: Request the device continue sending APDU.
+         *
+         * "empty abData field, continuation of response APDU is expected in the next
+         * RDR_to_PC_DataBlock"
+         * -- DWG Smart-Card USB Integrated Circuit(s) Card Devices rev 1.0
+         * § 6.1.1.3
+         */
+        const val LEVEL_PARAM_CONTINUE_RESPONSE: Short = 0x0010
+
+        private const val SLOT_NUMBER = 0x00
+
+        private const val ICC_STATUS_SUCCESS: Byte = 0
+
+        private const val DEVICE_COMMUNICATE_TIMEOUT_MILLIS = 5000
+        private const val DEVICE_SKIP_TIMEOUT_MILLIS = 100
+    }
+
+    data class UsbCcidErrorException(val msg: String, val errorResponse: CcidDataBlock) :
+        Exception(msg)
+
+    data class CcidDataBlock(
+        val dwLength: Int,
+        val bSlot: Byte,
+        val bSeq: Byte,
+        val bStatus: Byte,
+        val bError: Byte,
+        val bChainParameter: Byte,
+        val data: ByteArray?
+    ) {
+        companion object {
+            fun parseHeaderFromBytes(headerBytes: ByteArray): CcidDataBlock {
+                val buf = ByteBuffer.wrap(headerBytes)
+                buf.order(ByteOrder.LITTLE_ENDIAN)
+
+                val type = buf.get()
+                require(type == MESSAGE_TYPE_RDR_TO_PC_DATA_BLOCK.toByte()) { "Header has incorrect type value!" }
+                val dwLength = buf.int
+                val bSlot = buf.get()
+                val bSeq = buf.get()
+                val bStatus = buf.get()
+                val bError = buf.get()
+                val bChainParameter = buf.get()
+
+                return CcidDataBlock(dwLength, bSlot, bSeq, bStatus, bError, bChainParameter, null)
+            }
+        }
+
+        fun withData(d: ByteArray): CcidDataBlock {
+            require(data == null) { "Cannot add data twice" }
+            return CcidDataBlock(dwLength, bSlot, bSeq, bStatus, bError, bChainParameter, d)
+        }
+
+        val iccStatus: Byte
+            get() = (bStatus.toInt() and 0x03).toByte()
+
+        val commandStatus: Byte
+            get() = ((bStatus.toInt() shr 6) and 0x03).toByte()
+
+        val isStatusTimeoutExtensionRequest: Boolean
+            get() = commandStatus == COMMAND_STATUS_TIME_EXTENSION_RQUESTED
+
+        val isStatusSuccess: Boolean
+            get() = iccStatus == ICC_STATUS_SUCCESS && commandStatus == COMMAND_STATUS_SUCCESS
+    }
+
+    val hasAutomaticPps = usbCcidDescription.hasAutomaticPps
+
+    private val inputBuffer = ByteArray(usbBulkIn.maxPacketSize)
+
+    private var currentSequenceNumber: Byte = 0
+
+    private fun sendRaw(data: ByteArray, offset: Int, length: Int) {
+        val tr1 = usbConnection.bulkTransfer(
+            usbBulkOut, data, offset, length, DEVICE_COMMUNICATE_TIMEOUT_MILLIS
+        )
+        if (tr1 != length) {
+            throw UsbTransportException(
+                "USB error - failed to transmit data ($tr1/$length)"
+            )
+        }
+    }
+
+    private fun receiveDataBlock(expectedSequenceNumber: Byte): CcidDataBlock {
+        var response: CcidDataBlock?
+        do {
+            response = receiveDataBlockImmediate(expectedSequenceNumber)
+        } while (response!!.isStatusTimeoutExtensionRequest)
+        if (!response.isStatusSuccess) {
+            throw UsbCcidErrorException("USB-CCID error!", response)
+        }
+        return response
+    }
+
+    private fun receiveDataBlockImmediate(expectedSequenceNumber: Byte): CcidDataBlock {
+        /*
+         * Some USB CCID devices (notably NitroKey 3) may time-out and need a subsequent poke to
+         * carry on communications.  No particular reason why the number 3 was chosen.  If we get a
+         * zero-sized reply (or a time-out), we try again.  Clamped retries prevent an infinite loop
+         * if things really turn sour.
+         */
+        var attempts = 3
+        Log.d(TAG, "Receive data block immediate seq=$expectedSequenceNumber")
+        var readBytes: Int
+        do {
+            readBytes = usbConnection.bulkTransfer(
+                usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_COMMUNICATE_TIMEOUT_MILLIS
+            )
+            Log.d(TAG, "Received " + readBytes + " bytes: " + inputBuffer.encodeHex())
+        } while (readBytes <= 0 && attempts-- > 0)
+        if (readBytes < CCID_HEADER_LENGTH) {
+            throw UsbTransportException("USB-CCID error - failed to receive CCID header")
+        }
+        if (inputBuffer[0] != MESSAGE_TYPE_RDR_TO_PC_DATA_BLOCK.toByte()) {
+            if (expectedSequenceNumber != inputBuffer[6]) {
+                throw UsbTransportException(
+                    ((("USB-CCID error - bad CCID header, type " + inputBuffer[0]) + " (expected " +
+                            MESSAGE_TYPE_RDR_TO_PC_DATA_BLOCK) + "), sequence number " + inputBuffer[6]
+                            ) + " (expected " +
+                            expectedSequenceNumber + ")"
+                )
+            }
+            throw UsbTransportException(
+                "USB-CCID error - bad CCID header type " + inputBuffer[0]
+            )
+        }
+        var result = CcidDataBlock.parseHeaderFromBytes(inputBuffer)
+        if (expectedSequenceNumber != result.bSeq) {
+            throw UsbTransportException(
+                ("USB-CCID error - expected sequence number " +
+                        expectedSequenceNumber + ", got " + result)
+            )
+        }
+
+        val dataBuffer = ByteArray(result.dwLength)
+        var bufferedBytes = readBytes - CCID_HEADER_LENGTH
+        System.arraycopy(inputBuffer, CCID_HEADER_LENGTH, dataBuffer, 0, bufferedBytes)
+        while (bufferedBytes < dataBuffer.size) {
+            readBytes = usbConnection.bulkTransfer(
+                usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_COMMUNICATE_TIMEOUT_MILLIS
+            )
+            if (readBytes < 0) {
+                throw UsbTransportException(
+                    "USB error - failed reading response data! Header: $result"
+                )
+            }
+            System.arraycopy(inputBuffer, 0, dataBuffer, bufferedBytes, readBytes)
+            bufferedBytes += readBytes
+        }
+        result = result.withData(dataBuffer)
+        return result
+    }
+
+
+    private fun skipAvailableInput() {
+        var ignoredBytes: Int
+        do {
+            ignoredBytes = usbConnection.bulkTransfer(
+                usbBulkIn, inputBuffer, inputBuffer.size, DEVICE_SKIP_TIMEOUT_MILLIS
+            )
+            if (ignoredBytes > 0) {
+                Log.e(TAG, "Skipped $ignoredBytes bytes")
+            }
+        } while (ignoredBytes > 0)
+    }
+
+    /**
+     * Receives a continued XfrBlock. Should be called when a multiblock response is indicated
+     * 6.1.4 PC_to_RDR_XfrBlock
+     */
+    fun receiveContinuedResponse(): CcidDataBlock {
+        return sendXfrBlock(ByteArray(0), LEVEL_PARAM_CONTINUE_RESPONSE)
+    }
+
+    /**
+     * Transmits XfrBlock
+     * 6.1.4 PC_to_RDR_XfrBlock
+     *
+     * @param payload payload to transmit
+     * @param levelParam Level parameter
+     */
+    fun sendXfrBlock(
+        payload: ByteArray,
+        levelParam: Short = LEVEL_PARAM_START_SINGLE_CMD_APDU
+    ): CcidDataBlock {
+        val startTime = SystemClock.elapsedRealtime()
+        val l = payload.size
+        val sequenceNumber: Byte = currentSequenceNumber++
+        val headerData = byteArrayOf(
+            MESSAGE_TYPE_PC_TO_RDR_XFR_BLOCK.toByte(),
+            l.toByte(),
+            (l shr 8).toByte(),
+            (l shr 16).toByte(),
+            (l shr 24).toByte(),
+            SLOT_NUMBER.toByte(),
+            sequenceNumber,
+            0x00.toByte(),
+            (levelParam.toInt() and 0x00ff).toByte(),
+            (levelParam.toInt() shr 8).toByte()
+        )
+        val data: ByteArray = headerData + payload
+        var sentBytes = 0
+        while (sentBytes < data.size) {
+            val bytesToSend = usbBulkOut.maxPacketSize.coerceAtMost(data.size - sentBytes)
+            sendRaw(data, sentBytes, bytesToSend)
+            sentBytes += bytesToSend
+        }
+        val ccidDataBlock = receiveDataBlock(sequenceNumber)
+        val elapsedTime = SystemClock.elapsedRealtime() - startTime
+        Log.d(TAG, "USB XferBlock call took " + elapsedTime + "ms")
+        return ccidDataBlock
+    }
+
+    fun iccPowerOn(): CcidDataBlock {
+        val startTime = SystemClock.elapsedRealtime()
+        skipAvailableInput()
+        var response: CcidDataBlock? = null
+        for (v in usbCcidDescription.voltages) {
+            Log.v(TAG, "CCID: attempting to power on with voltage $v")
+            response = try {
+                iccPowerOnVoltage(v.powerOnValue)
+            } catch (e: UsbCcidErrorException) {
+                if (e.errorResponse.bError.toInt() == 7) { // Power select error
+                    Log.v(TAG, "CCID: failed to power on with voltage $v")
+                    iccPowerOff()
+                    Log.v(TAG, "CCID: powered off")
+                    continue
+                }
+                throw e
+            }
+            break
+        }
+        if (response == null) {
+            throw UsbTransportException("Couldn't power up ICC2")
+        }
+        val elapsedTime = SystemClock.elapsedRealtime() - startTime
+        Log.d(
+            TAG,
+            "Usb transport connected, took " + elapsedTime + "ms, ATR=" +
+                    response.data?.encodeHex()
+        )
+        return response
+    }
+
+    private fun iccPowerOnVoltage(voltage: Byte): CcidDataBlock {
+        val sequenceNumber = currentSequenceNumber++
+        val iccPowerCommand = byteArrayOf(
+            MESSAGE_TYPE_PC_TO_RDR_ICC_POWER_ON.toByte(),
+            0x00, 0x00, 0x00, 0x00,
+            SLOT_NUMBER.toByte(),
+            sequenceNumber,
+            voltage,
+            0x00, 0x00 // reserved for future use
+        )
+        sendRaw(iccPowerCommand, 0, iccPowerCommand.size)
+        return receiveDataBlock(sequenceNumber)
+    }
+
+    private fun iccPowerOff() {
+        val sequenceNumber = currentSequenceNumber++
+        val iccPowerCommand = byteArrayOf(
+            MESSAGE_TYPE_PC_TO_RDR_ICC_POWER_OFF.toByte(),
+            0x00, 0x00, 0x00, 0x00,
+            0x00,
+            sequenceNumber,
+            0x00
+        )
+        sendRaw(iccPowerCommand, 0, iccPowerCommand.size)
+    }
+}

app-common/src/main/java/im/angry/openeuicc/core/usb/UsbCcidUtils.kt

@@ -0,0 +1,36 @@
+// Adapted from <https://github.com/open-keychain/open-keychain/blob/master/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/usb>
+package im.angry.openeuicc.core.usb
+
+import android.hardware.usb.UsbConstants
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbEndpoint
+import android.hardware.usb.UsbInterface
+
+class UsbTransportException(msg: String) : Exception(msg)
+
+fun UsbInterface.getIoEndpoints(): Pair<UsbEndpoint?, UsbEndpoint?> {
+    var bulkIn: UsbEndpoint? = null
+    var bulkOut: UsbEndpoint? = null
+    for (i in 0 until endpointCount) {
+        val endpoint = getEndpoint(i)
+        if (endpoint.type != UsbConstants.USB_ENDPOINT_XFER_BULK) {
+            continue
+        }
+        if (endpoint.direction == UsbConstants.USB_DIR_IN) {
+            bulkIn = endpoint
+        } else if (endpoint.direction == UsbConstants.USB_DIR_OUT) {
+            bulkOut = endpoint
+        }
+    }
+    return Pair(bulkIn, bulkOut)
+}
+
+fun UsbDevice.getSmartCardInterface(): UsbInterface? {
+    for (i in 0 until interfaceCount) {
+        val anInterface = getInterface(i)
+        if (anInterface.interfaceClass == UsbConstants.USB_CLASS_CSCID) {
+            return anInterface
+        }
+    }
+    return null
+}

app-common/src/main/java/im/angry/openeuicc/di/AppContainer.kt

@@ -0,0 +1,18 @@
+package im.angry.openeuicc.di
+
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import im.angry.openeuicc.core.EuiccChannelFactory
+import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.core.EuiccChannelManagerFactory
+import im.angry.openeuicc.util.*
+
+interface AppContainer {
+    val telephonyManager: TelephonyManager
+    val euiccChannelManager: EuiccChannelManager
+    val euiccChannelManagerFactory: EuiccChannelManagerFactory
+    val subscriptionManager: SubscriptionManager
+    val preferenceRepository: PreferenceRepository
+    val uiComponentFactory: UiComponentFactory
+    val euiccChannelFactory: EuiccChannelFactory
+}

app-common/src/main/java/im/angry/openeuicc/di/DefaultAppContainer.kt

@@ -0,0 +1,41 @@
+package im.angry.openeuicc.di
+
+import android.content.Context
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import im.angry.openeuicc.core.DefaultEuiccChannelFactory
+import im.angry.openeuicc.core.DefaultEuiccChannelManager
+import im.angry.openeuicc.core.DefaultEuiccChannelManagerFactory
+import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.core.EuiccChannelManagerFactory
+import im.angry.openeuicc.util.*
+
+open class DefaultAppContainer(context: Context) : AppContainer {
+    override val telephonyManager by lazy {
+        context.getSystemService(TelephonyManager::class.java)!!
+    }
+
+    override val euiccChannelManager: EuiccChannelManager by lazy {
+        DefaultEuiccChannelManager(this, context)
+    }
+
+    override val euiccChannelManagerFactory: EuiccChannelManagerFactory by lazy {
+        DefaultEuiccChannelManagerFactory(this)
+    }
+
+    override val subscriptionManager by lazy {
+        context.getSystemService(SubscriptionManager::class.java)!!
+    }
+
+    override val preferenceRepository by lazy {
+        PreferenceRepository(context)
+    }
+
+    override val uiComponentFactory by lazy {
+        DefaultUiComponentFactory()
+    }
+
+    override val euiccChannelFactory by lazy {
+        DefaultEuiccChannelFactory(context)
+    }
+}

app-common/src/main/java/im/angry/openeuicc/di/DefaultUiComponentFactory.kt

@@ -0,0 +1,13 @@
+package im.angry.openeuicc.di
+
+import androidx.fragment.app.Fragment
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.ui.EuiccManagementFragment
+import im.angry.openeuicc.ui.NoEuiccPlaceholderFragment
+
+open class DefaultUiComponentFactory : UiComponentFactory {
+    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
+        EuiccManagementFragment.newInstance(channel.slotId, channel.portId)
+
+    override fun createNoEuiccPlaceholderFragment(): Fragment = NoEuiccPlaceholderFragment()
+}

app-common/src/main/java/im/angry/openeuicc/di/UiComponentFactory.kt

@@ -0,0 +1,10 @@
+package im.angry.openeuicc.di
+
+import androidx.fragment.app.Fragment
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.ui.EuiccManagementFragment
+
+interface UiComponentFactory {
+    fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment
+    fun createNoEuiccPlaceholderFragment(): Fragment
+}

app-common/src/main/java/im/angry/openeuicc/service/EuiccChannelManagerService.kt

@@ -0,0 +1,41 @@
+package im.angry.openeuicc.service
+
+import android.app.Service
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.util.*
+
+/**
+ * An Android Service wrapper for EuiccChannelManager.
+ * The purpose of this wrapper is mainly lifecycle-wise: having a Service allows the manager
+ * instance to have its own independent lifecycle. This way it can be created as requested and
+ * destroyed when no other components are bound to this service anymore.
+ * This behavior allows us to avoid keeping the APDU channels open at all times. For example,
+ * the EuiccService implementation should *only* bind to this service when it requires an
+ * instance of EuiccChannelManager. UI components can keep being bound to this service for
+ * their entire lifecycles, since the whole purpose of them is to expose the current state
+ * to the user.
+ */
+class EuiccChannelManagerService : Service(), OpenEuiccContextMarker {
+    inner class LocalBinder : Binder() {
+        val service = this@EuiccChannelManagerService
+    }
+
+    private val euiccChannelManagerDelegate = lazy {
+        appContainer.euiccChannelManagerFactory.createEuiccChannelManager(this)
+    }
+    val euiccChannelManager: EuiccChannelManager by euiccChannelManagerDelegate
+
+    override fun onBind(intent: Intent?): IBinder = LocalBinder()
+
+    override fun onDestroy() {
+        super.onDestroy()
+        // This is the whole reason of the existence of this service:
+        // we can clean up opened channels when no one is using them
+        if (euiccChannelManagerDelegate.isInitialized()) {
+            euiccChannelManager.invalidate()
+        }
+    }
+}

app-common/src/main/java/im/angry/openeuicc/ui/BaseEuiccAccessActivity.kt

@@ -0,0 +1,48 @@
+package im.angry.openeuicc.ui
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.Bundle
+import android.os.IBinder
+import androidx.appcompat.app.AppCompatActivity
+import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.service.EuiccChannelManagerService
+
+abstract class BaseEuiccAccessActivity : AppCompatActivity() {
+    lateinit var euiccChannelManager: EuiccChannelManager
+
+    private val euiccChannelManagerServiceConnection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+            euiccChannelManager =
+                (service!! as EuiccChannelManagerService.LocalBinder).service.euiccChannelManager
+            onInit()
+        }
+
+        override fun onServiceDisconnected(name: ComponentName?) {
+            // These activities should never lose the EuiccChannelManagerService connection
+            finish()
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        bindService(
+            Intent(this, EuiccChannelManagerService::class.java),
+            euiccChannelManagerServiceConnection,
+            Context.BIND_AUTO_CREATE
+        )
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        unbindService(euiccChannelManagerServiceConnection)
+    }
+
+    /**
+     * When called, euiccChannelManager is guaranteed to have been initialized
+     */
+    abstract fun onInit()
+}

app-common/src/main/java/im/angry/openeuicc/ui/DirectProfileDownloadActivity.kt

@@ -1,34 +1,31 @@
 package im.angry.openeuicc.ui
 
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class DirectProfileDownloadActivity : AppCompatActivity(), SlotSelectFragment.SlotSelectedListener, OpenEuiccContextMarker {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+class DirectProfileDownloadActivity : BaseEuiccAccessActivity(), SlotSelectFragment.SlotSelectedListener, OpenEuiccContextMarker {
+    override fun onInit() {
         lifecycleScope.launch {
-            withContext(Dispatchers.IO) {
+            val knownChannels = withContext(Dispatchers.IO) {
                 euiccChannelManager.enumerateEuiccChannels()
             }
 
             when {
-                euiccChannelManager.knownChannels.isEmpty() -> {
+                knownChannels.isEmpty() -> {
                     finish()
                 }
-                euiccChannelManager.knownChannels.hasMultipleChips -> {
-                    SlotSelectFragment.newInstance()
+                knownChannels.hasMultipleChips -> {
+                    SlotSelectFragment.newInstance(knownChannels.sortedBy { it.logicalSlotId })
                         .show(supportFragmentManager, SlotSelectFragment.TAG)
                 }
                 else -> {
                     // If the device has only one eSIM "chip" (but may be mapped to multiple slots),
                     // we can skip the slot selection dialog since there is only one chip to save to.
-                    onSlotSelected(euiccChannelManager.knownChannels[0].slotId,
-                        euiccChannelManager.knownChannels[0].portId)
+                    onSlotSelected(knownChannels[0].slotId,
+                        knownChannels[0].portId)
                 }
             }
         }

app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt

@@ -1,6 +1,8 @@
 package im.angry.openeuicc.ui
 
 import android.annotation.SuppressLint
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Intent
 import android.os.Bundle
 import android.text.method.PasswordTransformationMethod
@@ -16,6 +18,7 @@ import android.widget.ImageButton
 import android.widget.PopupMenu
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -24,12 +27,15 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import net.typeblog.lpac_jni.LocalProfileInfo
 import im.angry.openeuicc.common.R
+import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.lang.Exception
 
 open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
     EuiccChannelFragmentMarker {
@@ -46,6 +52,14 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
 
     private val adapter = EuiccProfileAdapter()
 
+    // Marker for when this fragment might enter an invalid state
+    // e.g. after a failed enable / disable operation
+    private var invalid = false
+
+    // Subscribe to settings we care about outside of coroutine contexts while initializing
+    // This gives us access to the "latest" state without having to launch coroutines
+    private lateinit var disableSafeguardFlow: StateFlow<Boolean>
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
@@ -58,9 +72,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
     ): View {
         val view = inflater.inflate(R.layout.fragment_euicc, container, false)
 
-        swipeRefresh = view.findViewById(R.id.swipe_refresh)
-        fab = view.findViewById(R.id.fab)
-        profileList = view.findViewById(R.id.profile_list)
+        swipeRefresh = view.requireViewById(R.id.swipe_refresh)
+        fab = view.requireViewById(R.id.fab)
+        profileList = view.requireViewById(R.id.profile_list)
 
         return view
     }
@@ -76,10 +90,7 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
             ProfileDownloadFragment.newInstance(slotId, portId)
                 .show(childFragmentManager, ProfileDownloadFragment.TAG)
         }
-    }
 
-    override fun onStart() {
-        super.onStart()
         refresh()
     }
 
@@ -101,24 +112,40 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                 }
                 true
             }
+
             else -> super.onOptionsItemSelected(item)
         }
 
-    protected open suspend fun onCreateFooterViews(parent: ViewGroup): List<View> = listOf()
+    protected open suspend fun onCreateFooterViews(
+        parent: ViewGroup,
+        profiles: List<LocalProfileInfo>
+    ): List<View> =
+        if (profiles.isEmpty()) {
+            val view = layoutInflater.inflate(R.layout.footer_no_profile, parent, false)
+            listOf(view)
+        } else {
+            listOf()
+        }
 
     @SuppressLint("NotifyDataSetChanged")
     private fun refresh() {
+        if (invalid) return
         swipeRefresh.isRefreshing = true
 
         lifecycleScope.launch {
+            if (!this@EuiccManagementFragment::disableSafeguardFlow.isInitialized) {
+                disableSafeguardFlow =
+                    preferenceRepository.disableSafeguardFlow.stateIn(lifecycleScope)
+            }
+
             val profiles = withContext(Dispatchers.IO) {
                 euiccChannelManager.notifyEuiccProfilesChanged(channel.logicalSlotId)
-                channel.lpa.profiles
+                channel.lpa.profiles.operational
             }
 
             withContext(Dispatchers.Main) {
-                adapter.profiles = profiles.operational
-                adapter.footerViews = onCreateFooterViews(profileList)
+                adapter.profiles = profiles
+                adapter.footerViews = onCreateFooterViews(profileList, profiles)
                 adapter.notifyDataSetChanged()
                 swipeRefresh.isRefreshing = false
             }
@@ -130,40 +157,95 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         fab.isEnabled = false
 
         lifecycleScope.launch {
-            try {
-                if (enable) {
-                    doEnableProfile(iccid)
+            beginTrackedOperation {
+                val (res, refreshed) =
+                    if (!channel.lpa.switchProfile(iccid, enable, refresh = true)) {
+                        // Sometimes, we *can* enable or disable the profile, but we cannot
+                        // send the refresh command to the modem because the profile somehow
+                        // makes the modem "busy". In this case, we can still switch by setting
+                        // refresh to false, but then the switch cannot take effect until the
+                        // user resets the modem manually by toggling airplane mode or rebooting.
+                        Pair(channel.lpa.switchProfile(iccid, enable, refresh = false), false)
                     } else {
-                    doDisableProfile(iccid)
+                        Pair(true, true)
+                    }
+
+                if (!res) {
+                    Log.d(TAG, "Failed to enable / disable profile $iccid")
+                    withContext(Dispatchers.Main) {
+                        Toast.makeText(
+                            context,
+                            R.string.toast_profile_enable_failed,
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                    return@beginTrackedOperation false
+                }
+
+                if (!refreshed && !isUsb) {
+                    withContext(Dispatchers.Main) {
+                        AlertDialog.Builder(requireContext()).apply {
+                            setMessage(R.string.switch_did_not_refresh)
+                            setPositiveButton(android.R.string.ok) { dialog, _ ->
+                                dialog.dismiss()
+                                requireActivity().finish()
+                            }
+                            setOnDismissListener { _ ->
+                                requireActivity().finish()
+                            }
+                            show()
+                        }
+                    }
+                    return@beginTrackedOperation true
+                }
+
+                if (!isUsb) {
+                    try {
+                        euiccChannelManager.waitForReconnect(
+                            slotId,
+                            portId,
+                            timeoutMillis = 30 * 1000
+                        )
+                    } catch (e: TimeoutCancellationException) {
+                        withContext(Dispatchers.Main) {
+                            // Prevent this Fragment from being used again
+                            invalid = true
+                            // Timed out waiting for SIM to come back online, we can no longer assume that the LPA is still valid
+                            AlertDialog.Builder(requireContext()).apply {
+                                setMessage(R.string.enable_disable_timeout)
+                                setPositiveButton(android.R.string.ok) { dialog, _ ->
+                                    dialog.dismiss()
+                                    requireActivity().finish()
+                                }
+                                setOnDismissListener { _ ->
+                                    requireActivity().finish()
+                                }
+                                show()
+                            }
+                        }
+                        return@beginTrackedOperation false
+                    }
+                }
+
+                preferenceRepository.notificationSwitchFlow.first()
             }
             refresh()
             fab.isEnabled = true
-            } catch (e: Exception) {
-                Log.d(TAG, "Failed to enable / disable profile $iccid")
-                Log.d(TAG, Log.getStackTraceString(e))
-                fab.isEnabled = true
-                Toast.makeText(context, R.string.toast_profile_enable_failed, Toast.LENGTH_LONG).show()
         }
     }
-    }
-
-    private suspend fun doEnableProfile(iccid: String) =
-        channel.lpa.beginOperation {
-            channel.lpa.enableProfile(iccid, reconnectTimeout = 15 * 1000) &&
-                preferenceRepository.notificationEnableFlow.first()
-        }
-
-    private suspend fun doDisableProfile(iccid: String) =
-        channel.lpa.beginOperation {
-            channel.lpa.disableProfile(iccid, reconnectTimeout = 15 * 1000) &&
-                preferenceRepository.notificationDisableFlow.first()
-        }
 
     protected open fun populatePopupWithProfileActions(popup: PopupMenu, profile: LocalProfileInfo) {
         popup.inflate(R.menu.profile_options)
         if (profile.isEnabled) {
             popup.menu.findItem(R.id.enable).isVisible = false
             popup.menu.findItem(R.id.delete).isVisible = false
+
+            // We hide the disable option by default to avoid "bricking" some cards that won't get
+            // recognized again by the phone's modem. However we don't have that worry if we are
+            // accessing it through a USB card reader, or when the user explicitly opted in
+            if (isUsb || disableSafeguardFlow.value) {
+                popup.menu.findItem(R.id.disable).isVisible = true
+            }
         }
     }
 
@@ -180,6 +262,13 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
     }
 
     inner class FooterViewHolder: ViewHolder(FrameLayout(requireContext())) {
+        init {
+            itemView.layoutParams = ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+        }
+
         fun attach(view: View) {
             view.parent?.let { (it as ViewGroup).removeView(view) }
             (itemView as FrameLayout).addView(view)
@@ -191,11 +280,11 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
     }
 
     inner class ProfileViewHolder(private val root: View) : ViewHolder(root) {
-        private val iccid: TextView = root.findViewById(R.id.iccid)
-        private val name: TextView = root.findViewById(R.id.name)
-        private val state: TextView = root.findViewById(R.id.state)
-        private val provider: TextView = root.findViewById(R.id.provider)
-        private val profileMenu: ImageButton = root.findViewById(R.id.profile_menu)
+        private val iccid: TextView = root.requireViewById(R.id.iccid)
+        private val name: TextView = root.requireViewById(R.id.name)
+        private val state: TextView = root.requireViewById(R.id.state)
+        private val provider: TextView = root.requireViewById(R.id.provider)
+        private val profileMenu: ImageButton = root.requireViewById(R.id.profile_menu)
 
         init {
             iccid.setOnClickListener {
@@ -206,6 +295,14 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                 }
             }
 
+            iccid.setOnLongClickListener {
+                requireContext().getSystemService(ClipboardManager::class.java)!!
+                    .setPrimaryClip(ClipData.newPlainText("iccid", iccid.text))
+                Toast.makeText(requireContext(), R.string.toast_iccid_copied, Toast.LENGTH_SHORT)
+                    .show()
+                true
+            }
+
             profileMenu.setOnClickListener { showOptionsMenu() }
         }
 
@@ -228,6 +325,9 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
         }
 
         private fun showOptionsMenu() {
+            // Prevent users from doing multiple things at once
+            if (invalid || swipeRefresh.isRefreshing) return
+
             PopupMenu(root.context, profileMenu).apply {
                 setOnMenuItemClickListener(::onMenuItemClicked)
                 populatePopupWithProfileActions(this, profile)

app-common/src/main/java/im/angry/openeuicc/ui/LogsActivity.kt

@@ -1,31 +1,50 @@
 package im.angry.openeuicc.ui
 
+import android.icu.text.SimpleDateFormat
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import android.widget.ScrollView
 import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import im.angry.openeuicc.common.R
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.io.FileOutputStream
+import java.util.Date
 
 class LogsActivity : AppCompatActivity() {
     private lateinit var swipeRefresh: SwipeRefreshLayout
     private lateinit var scrollView: ScrollView
     private lateinit var logText: TextView
+    private lateinit var logStr: String
+
+    private val saveLogs =
+        registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { uri ->
+            if (uri == null) return@registerForActivityResult
+            if (!this::logStr.isInitialized) return@registerForActivityResult
+            contentResolver.openFileDescriptor(uri, "w")?.use {
+                FileOutputStream(it.fileDescriptor).use { os ->
+                    os.write(logStr.encodeToByteArray())
+                }
+            }
+        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_logs)
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(requireViewById(R.id.toolbar))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
-        swipeRefresh = findViewById(R.id.swipe_refresh)
-        scrollView = findViewById(R.id.scroll_view)
-        logText = findViewById(R.id.log_text)
+        swipeRefresh = requireViewById(R.id.swipe_refresh)
+        scrollView = requireViewById(R.id.scroll_view)
+        logText = requireViewById(R.id.log_text)
 
         swipeRefresh.setOnRefreshListener {
             lifecycleScope.launch {
@@ -41,19 +60,30 @@ class LogsActivity : AppCompatActivity() {
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.activity_logs, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
+        R.id.save -> {
+            saveLogs.launch(getString(R.string.logs_filename_template,
+                SimpleDateFormat.getDateTimeInstance().format(Date())
+            ))
+            true
+        }
+        else -> super.onOptionsItemSelected(item)
+    }
+
     private suspend fun reload() = withContext(Dispatchers.Main) {
         swipeRefresh.isRefreshing = true
 
-        val logStr = withContext(Dispatchers.IO) {
-            try {
-                Runtime.getRuntime().exec("logcat -t 1024").inputStream.readBytes()
-                    .decodeToString()
-            } catch (_: Exception) {
-                ""
-            }
-        }
+        logStr = intent.extras?.getString("log") ?: readSelfLog()
 
-        logText.text = logStr
+        logText.text = withContext(Dispatchers.IO) {
+            // Limit the UI to display only 256 lines
+            logStr.lines().takeLast(256).joinToString("\n")
+        }
 
         swipeRefresh.isRefreshing = false
 

app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt

@@ -1,86 +1,96 @@
 package im.angry.openeuicc.ui
 
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
+import android.hardware.usb.UsbManager
 import android.os.Bundle
 import android.telephony.TelephonyManager
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Spinner
-import androidx.appcompat.app.AppCompatActivity
+import android.widget.ProgressBar
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
+@SuppressLint("NotifyDataSetChanged")
+open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     companion object {
         const val TAG = "MainActivity"
     }
 
-    protected lateinit var manager: EuiccChannelManager
+    private lateinit var loadingProgress: ProgressBar
+    private lateinit var tabs: TabLayout
+    private lateinit var viewPager: ViewPager2
 
-    private lateinit var spinnerAdapter: ArrayAdapter<String>
-    private lateinit var spinner: Spinner
+    private var refreshing = false
 
-    private val fragments = arrayListOf<EuiccManagementFragment>()
+    private data class Page(
+        val title: String,
+        val createFragment: () -> Fragment
+    )
 
-    private lateinit var noEuiccPlaceholder: View
+    private val pages: MutableList<Page> = mutableListOf()
+
+    private val pagerAdapter by lazy {
+        object : FragmentStateAdapter(this) {
+            override fun getItemCount() = pages.size
+
+            override fun createFragment(position: Int): Fragment = pages[position].createFragment()
+        }
+    }
 
     protected lateinit var tm: TelephonyManager
 
+    private val usbReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action == UsbManager.ACTION_USB_DEVICE_ATTACHED || intent?.action == UsbManager.ACTION_USB_DEVICE_DETACHED) {
+                refresh(true)
+            }
+        }
+    }
+
+    @SuppressLint("WrongConstant", "UnspecifiedRegisterReceiverFlag")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(requireViewById(R.id.toolbar))
+        loadingProgress = requireViewById(R.id.loading)
+        tabs = requireViewById(R.id.main_tabs)
+        viewPager = requireViewById(R.id.view_pager)
 
-        noEuiccPlaceholder = findViewById(R.id.no_euicc_placeholder)
+        viewPager.adapter = pagerAdapter
+        TabLayoutMediator(tabs, viewPager) { tab, pos ->
+            tab.text = pages[pos].title
+        }.attach()
 
         tm = telephonyManager
 
-        manager = euiccChannelManager
-
-        spinnerAdapter = ArrayAdapter<String>(this, R.layout.spinner_item)
-
-        lifecycleScope.launch {
-            init()
+        registerReceiver(usbReceiver, IntentFilter().apply {
+            addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED)
+            addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
+        })
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        unregisterReceiver(usbReceiver)
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.activity_main, menu)
-
-        if (!this::spinner.isInitialized) {
-            spinner = menu.findItem(R.id.spinner).actionView as Spinner
-            spinner.adapter = spinnerAdapter
-            spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(
-                    parent: AdapterView<*>?,
-                    view: View?,
-                    position: Int,
-                    id: Long
-                ) {
-                    supportFragmentManager.beginTransaction()
-                        .replace(R.id.fragment_root, fragments[position]).commit()
-                }
-
-                override fun onNothingSelected(parent: AdapterView<*>?) {
-                }
-
-            }
-        } else {
-            // Fragments may cause this menu to be inflated multiple times.
-            // Simply reuse the action view in that case
-            menu.findItem(R.id.spinner).actionView = spinner
-        }
-
         return true
     }
 
@@ -90,36 +100,93 @@ open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
                 startActivity(Intent(this, SettingsActivity::class.java));
                 true
             }
+            R.id.reload -> {
+                refresh()
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
 
+    override fun onInit() {
+        lifecycleScope.launch {
+            init()
+        }
+    }
 
-    protected open fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
-        EuiccManagementFragment.newInstance(channel.slotId, channel.portId)
+    private suspend fun init(fromUsbEvent: Boolean = false) {
+        refreshing = true // We don't check this here -- the check happens in refresh()
+        loadingProgress.visibility = View.VISIBLE
+        viewPager.visibility = View.GONE
+        tabs.visibility = View.GONE
 
-    private suspend fun init() {
-        withContext(Dispatchers.IO) {
-            manager.enumerateEuiccChannels()
-            manager.knownChannels.forEach {
+        val knownChannels = withContext(Dispatchers.IO) {
+            euiccChannelManager.enumerateEuiccChannels().onEach {
                 Log.d(TAG, "slot ${it.slotId} port ${it.portId}")
                 Log.d(TAG, it.lpa.eID)
                 // Request the system to refresh the list of profiles every time we start
                 // Note that this is currently supposed to be no-op when unprivileged,
                 // but it could change in the future
-                manager.notifyEuiccProfilesChanged(it.logicalSlotId)
+                euiccChannelManager.notifyEuiccProfilesChanged(it.logicalSlotId)
             }
         }
 
+        val (usbDevice, _) = withContext(Dispatchers.IO) {
+            euiccChannelManager.enumerateUsbEuiccChannel()
+        }
+
         withContext(Dispatchers.Main) {
-            manager.knownChannels.sortedBy { it.logicalSlotId }.forEach { channel ->
-                spinnerAdapter.add(getString(R.string.channel_name_format, channel.logicalSlotId))
-                fragments.add(createEuiccManagementFragment(channel))
+            loadingProgress.visibility = View.GONE
+
+            knownChannels.sortedBy { it.logicalSlotId }.forEach { channel ->
+                pages.add(Page(
+                    getString(R.string.channel_name_format, channel.logicalSlotId)
+                ) { appContainer.uiComponentFactory.createEuiccManagementFragment(channel) })
             }
 
-            if (fragments.isNotEmpty()) {
-                noEuiccPlaceholder.visibility = View.GONE
-                supportFragmentManager.beginTransaction().replace(R.id.fragment_root, fragments.first()).commit()
+            // If USB readers exist, add them at the very last
+            // We use a wrapper fragment to handle logic specific to USB readers
+            usbDevice?.let {
+                pages.add(Page(it.productName ?: getString(R.string.usb)) { UsbCcidReaderFragment() })
             }
+            viewPager.visibility = View.VISIBLE
+
+            if (pages.size > 1) {
+                tabs.visibility = View.VISIBLE
+            } else if (pages.isEmpty()) {
+                pages.add(Page("") { appContainer.uiComponentFactory.createNoEuiccPlaceholderFragment() })
+            }
+
+            pagerAdapter.notifyDataSetChanged()
+            // Reset the adapter so that the current view actually gets cleared
+            // notifyDataSetChanged() doesn't cause the current view to be removed.
+            viewPager.adapter = pagerAdapter
+
+            if (fromUsbEvent && usbDevice != null) {
+                // If this refresh was triggered by a USB insertion while active, scroll to that page
+                viewPager.post {
+                    viewPager.setCurrentItem(pages.size - 1, true)
+                }
+            } else {
+                viewPager.currentItem = 0
+            }
+
+            refreshing = false
+        }
+    }
+
+    private fun refresh(fromUsbEvent: Boolean = false) {
+        if (refreshing) return
+        lifecycleScope.launch {
+            refreshing = true
+            loadingProgress.visibility = View.VISIBLE
+            viewPager.visibility = View.GONE
+            tabs.visibility = View.GONE
+
+            pages.clear()
+            pagerAdapter.notifyDataSetChanged()
+            viewPager.adapter = pagerAdapter
+
+            init(fromUsbEvent) // will set refreshing = false
         }
     }
 }

app-common/src/main/java/im/angry/openeuicc/ui/NoEuiccPlaceholderFragment.kt

@@ -0,0 +1,18 @@
+package im.angry.openeuicc.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import im.angry.openeuicc.common.R
+
+class NoEuiccPlaceholderFragment : Fragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_no_euicc_placeholder, container, false)
+    }
+}

app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt

@@ -12,7 +12,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.forEach
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -21,13 +20,14 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.LocalProfileNotification
 
-class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
+class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     private lateinit var swipeRefresh: SwipeRefreshLayout
     private lateinit var notificationList: RecyclerView
     private val notificationAdapter = NotificationAdapter()
@@ -37,14 +37,16 @@ class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_notifications)
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(requireViewById(R.id.toolbar))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+    }
 
+    override fun onInit() {
         euiccChannel = euiccChannelManager
             .findEuiccChannelBySlotBlocking(intent.getIntExtra("logicalSlotId", 0))!!
 
-        swipeRefresh = findViewById(R.id.swipe_refresh)
-        notificationList = findViewById(R.id.recycler_view)
+        swipeRefresh = requireViewById(R.id.swipe_refresh)
+        notificationList = requireViewById(R.id.recycler_view)
 
         notificationList.layoutManager =
             LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
@@ -52,6 +54,16 @@ class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
         notificationList.adapter = notificationAdapter
         registerForContextMenu(notificationList)
 
+        // This is slightly different from the MainActivity logic
+        // due to the length (we don't want to display the full USB product name)
+        val channelTitle = if (euiccChannel.logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) {
+            getString(R.string.usb)
+        } else {
+            getString(R.string.channel_name_format, euiccChannel.logicalSlotId)
+        }
+
+        title = getString(R.string.profile_notifications_detailed_format, channelTitle)
+
         swipeRefresh.setOnRefreshListener {
             refresh()
         }
@@ -118,8 +130,8 @@ class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
     @SuppressLint("ClickableViewAccessibility")
     inner class NotificationViewHolder(private val root: View):
         RecyclerView.ViewHolder(root), View.OnCreateContextMenuListener, OnMenuItemClickListener {
-        private val address: TextView = root.findViewById(R.id.notification_address)
-        private val profileName: TextView = root.findViewById(R.id.notification_profile_name)
+        private val address: TextView = root.requireViewById(R.id.notification_address)
+        private val profileName: TextView = root.requireViewById(R.id.notification_profile_name)
 
         private lateinit var notification: LocalProfileNotificationWrapper
 
@@ -179,8 +191,9 @@ class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
                         withContext(Dispatchers.IO) {
                             euiccChannel.lpa.handleNotification(notification.inner.seqNumber)
                         }
-                    }
+
                         refresh()
+                    }
                     true
                 }
                 R.id.notification_delete -> {
@@ -188,8 +201,9 @@ class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
                         withContext(Dispatchers.IO) {
                             euiccChannel.lpa.deleteNotification(notification.inner.seqNumber)
                         }
-                    }
+
                         refresh()
+                    }
                     true
                 }
                 else -> false

app-common/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt

@@ -2,7 +2,9 @@ package im.angry.openeuicc.ui
 
 import android.app.Dialog
 import android.os.Bundle
+import android.text.Editable
 import android.util.Log
+import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
@@ -26,11 +28,21 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
         }
     }
 
+    private val editText by lazy {
+        EditText(requireContext()).apply {
+            hint = Editable.Factory.getInstance().newEditable(
+                getString(R.string.profile_delete_confirm_input, requireArguments().getString("name")!!)
+            )
+        }
+    }
+    private val inputMatchesName: Boolean
+        get() = editText.text.toString() == requireArguments().getString("name")!!
     private var deleting = false
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme).apply {
             setMessage(getString(R.string.profile_delete_confirm, requireArguments().getString("name")))
+            setView(editText)
             setPositiveButton(android.R.string.ok, null) // Set listener to null to prevent auto closing
             setNegativeButton(android.R.string.cancel, null)
         }.create()
@@ -40,7 +52,7 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
         super.onResume()
         val alertDialog = dialog!! as AlertDialog
         alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
-            if (!deleting) delete()
+            if (!deleting && inputMatchesName) delete()
         }
         alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener {
             if (!deleting) dismiss()
@@ -70,7 +82,7 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
         }
     }
 
-    private suspend fun doDelete() = channel.lpa.beginOperation {
+    private suspend fun doDelete() = beginTrackedOperation {
         channel.lpa.deleteProfile(requireArguments().getString("iccid")!!)
         preferenceRepository.notificationDeleteFlow.first()
     }

app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt

@@ -3,14 +3,15 @@ package im.angry.openeuicc.ui
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.DialogInterface
+import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.text.Editable
-import android.text.format.Formatter
 import android.util.Log
 import android.view.*
 import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
@@ -55,12 +56,37 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
     private val barcodeScannerLauncher = registerForActivityResult(ScanContract()) { result ->
         result.contents?.let { content ->
             Log.d(TAG, content)
-            val components = content.split("$")
-            if (components.size < 3 || components[0] != "LPA:1") return@registerForActivityResult
+            onScanResult(content)
+        }
+    }
+
+    private val gallerySelectorLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { result ->
+        if (result == null) return@registerForActivityResult
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            runCatching {
+                requireContext().contentResolver.openInputStream(result)?.let { input ->
+                    val bmp = BitmapFactory.decodeStream(input)
+                    input.close()
+
+                    decodeQrFromBitmap(bmp)?.let {
+                        withContext(Dispatchers.Main) {
+                            onScanResult(it)
+                        }
+                    }
+
+                    bmp.recycle()
+                }
+            }
+        }
+    }
+
+    private fun onScanResult(result: String) {
+        val components = result.split("$")
+        if (components.size < 3 || components[0] != "LPA:1") return
         profileDownloadServer.editText?.setText(components[1])
         profileDownloadCode.editText?.setText(components[2])
     }
-    }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -69,13 +95,13 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
     ): View {
         val view = inflater.inflate(R.layout.fragment_profile_download, container, false)
 
-        toolbar = view.findViewById(R.id.toolbar)
-        profileDownloadServer = view.findViewById(R.id.profile_download_server)
-        profileDownloadCode = view.findViewById(R.id.profile_download_code)
-        profileDownloadConfirmationCode = view.findViewById(R.id.profile_download_confirmation_code)
-        profileDownloadIMEI = view.findViewById(R.id.profile_download_imei)
-        profileDownloadFreeSpace = view.findViewById(R.id.profile_download_free_space)
-        progress = view.findViewById(R.id.progress)
+        toolbar = view.requireViewById(R.id.toolbar)
+        profileDownloadServer = view.requireViewById(R.id.profile_download_server)
+        profileDownloadCode = view.requireViewById(R.id.profile_download_code)
+        profileDownloadConfirmationCode = view.requireViewById(R.id.profile_download_confirmation_code)
+        profileDownloadIMEI = view.requireViewById(R.id.profile_download_imei)
+        profileDownloadFreeSpace = view.requireViewById(R.id.profile_download_free_space)
+        progress = view.requireViewById(R.id.progress)
 
         toolbar.inflateMenu(R.menu.fragment_profile_download)
 
@@ -104,6 +130,10 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
                 })
                 true
             }
+            R.id.scan_from_gallery -> {
+                gallerySelectorLauncher.launch("image/*")
+                true
+            }
             R.id.ok -> {
                 startDownloadProfile()
                 true
@@ -121,7 +151,7 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
         super.onStart()
         profileDownloadIMEI.editText!!.text = Editable.Factory.getInstance().newEditable(
             try {
-                openEuiccApplication.telephonyManager.getImei(channel.logicalSlotId)
+                telephonyManager.getImei(channel.logicalSlotId) ?: ""
             } catch (e: Exception) {
                 ""
             }
@@ -131,7 +161,7 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
             // Fetch remaining NVRAM
             val str = channel.lpa.euiccInfo2?.freeNvram?.also {
                 freeNvram = it
-            }?.let { Formatter.formatShortFileSize(requireContext(), it.toLong()) }
+            }?.let { formatFreeSpace(it) }
 
             withContext(Dispatchers.Main) {
                 profileDownloadFreeSpace.text = getString(R.string.profile_download_free_space,
@@ -189,8 +219,18 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
         }
     }
 
-    private suspend fun doDownloadProfile(server: String, code: String?, confirmationCode: String?, imei: String?) = channel.lpa.beginOperation {
-        downloadProfile(server, code, imei, confirmationCode, object : ProfileDownloadCallback {
+    private suspend fun doDownloadProfile(
+        server: String,
+        code: String?,
+        confirmationCode: String?,
+        imei: String?
+    ) = beginTrackedOperation {
+        val res = channel.lpa.downloadProfile(
+            server,
+            code,
+            imei,
+            confirmationCode,
+            object : ProfileDownloadCallback {
                 override fun onStateUpdate(state: ProfileDownloadCallback.DownloadState) {
                     lifecycleScope.launch(Dispatchers.Main) {
                         progress.isIndeterminate = false
@@ -199,8 +239,14 @@ class ProfileDownloadFragment : BaseMaterialDialogFragment(),
                 }
             })
 
+        if (!res) {
+            // TODO: Provide more details on the error
+            throw RuntimeException("Failed to download profile; this is typically caused by another error happened before.")
+        }
+
         // If we get here, we are successful
-        // Only send notifications if the user allowed us to
+        // This function is wrapped in beginTrackedOperation, so by returning the settings value,
+        // We only send notifications if the user allowed us to
         preferenceRepository.notificationDownloadFlow.first()
     }
 

app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt

@@ -46,9 +46,9 @@ class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragment
     ): View {
         val view = inflater.inflate(R.layout.fragment_profile_rename, container, false)
 
-        toolbar = view.findViewById(R.id.toolbar)
-        profileRenameNewName = view.findViewById(R.id.profile_rename_new_name)
-        progress = view.findViewById(R.id.progress)
+        toolbar = view.requireViewById(R.id.toolbar)
+        profileRenameNewName = view.requireViewById(R.id.profile_rename_new_name)
+        progress = view.requireViewById(R.id.progress)
 
         toolbar.inflateMenu(R.menu.fragment_profile_rename)
 

app-common/src/main/java/im/angry/openeuicc/ui/SettingsActivity.kt

@@ -9,7 +9,7 @@ class SettingsActivity: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(requireViewById(R.id.toolbar))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
         supportFragmentManager.beginTransaction()
             .replace(R.id.settings_container, SettingsFragment())

app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt

@@ -39,11 +39,14 @@ class SettingsFragment: PreferenceFragmentCompat() {
         findPreference<CheckBoxPreference>("pref_notifications_delete")
             ?.bindBooleanFlow(preferenceRepository.notificationDeleteFlow, PreferenceKeys.NOTIFICATION_DELETE)
 
-        findPreference<CheckBoxPreference>("pref_notifications_enable")
-            ?.bindBooleanFlow(preferenceRepository.notificationEnableFlow, PreferenceKeys.NOTIFICATION_ENABLE)
+        findPreference<CheckBoxPreference>("pref_notifications_switch")
+            ?.bindBooleanFlow(preferenceRepository.notificationSwitchFlow, PreferenceKeys.NOTIFICATION_SWITCH)
 
-        findPreference<CheckBoxPreference>("pref_notifications_disable")
-            ?.bindBooleanFlow(preferenceRepository.notificationDisableFlow, PreferenceKeys.NOTIFICATION_DISABLE)
+        findPreference<CheckBoxPreference>("pref_advanced_disable_safeguard_removable_esim")
+            ?.bindBooleanFlow(preferenceRepository.disableSafeguardFlow, PreferenceKeys.DISABLE_SAFEGUARD_REMOVABLE_ESIM)
+
+        findPreference<CheckBoxPreference>("pref_advanced_operational_profiles_only")
+            ?.bindBooleanFlow(preferenceRepository.operationalOnlyFlow, PreferenceKeys.OPERATIONAL_PROFILES_ONLY)
     }
 
     private fun CheckBoxPreference.bindBooleanFlow(flow: Flow<Boolean>, key: Preferences.Key<Boolean>) {

app-common/src/main/java/im/angry/openeuicc/ui/SlotSelectFragment.kt

@@ -16,8 +16,14 @@ class SlotSelectFragment : BaseMaterialDialogFragment(), OpenEuiccContextMarker
     companion object {
         const val TAG = "SlotSelectFragment"
 
-        fun newInstance(): SlotSelectFragment {
-            return SlotSelectFragment()
+        fun newInstance(knownChannels: List<EuiccChannel>): SlotSelectFragment {
+            return SlotSelectFragment().apply {
+                arguments = Bundle().apply {
+                    putIntArray("slotIds", knownChannels.map { it.slotId }.toIntArray())
+                    putIntArray("logicalSlotIds", knownChannels.map { it.logicalSlotId }.toIntArray())
+                    putIntArray("portIds", knownChannels.map { it.portId }.toIntArray())
+                }
+            }
         }
     }
 
@@ -28,9 +34,10 @@ class SlotSelectFragment : BaseMaterialDialogFragment(), OpenEuiccContextMarker
 
     private lateinit var toolbar: Toolbar
     private lateinit var spinner: Spinner
-    private val channels: List<EuiccChannel> by lazy {
-        euiccChannelManager.knownChannels.sortedBy { it.logicalSlotId }
-    }
+    private lateinit var adapter: ArrayAdapter<String>
+    private lateinit var slotIds: IntArray
+    private lateinit var logicalSlotIds: IntArray
+    private lateinit var portIds: IntArray
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -39,30 +46,39 @@ class SlotSelectFragment : BaseMaterialDialogFragment(), OpenEuiccContextMarker
     ): View? {
         val view = inflater.inflate(R.layout.fragment_slot_select, container, false)
 
-        toolbar = view.findViewById(R.id.toolbar)
+        toolbar = view.requireViewById(R.id.toolbar)
         toolbar.setTitle(R.string.slot_select)
         toolbar.inflateMenu(R.menu.fragment_slot_select)
 
-        val adapter = ArrayAdapter<String>(inflater.context, R.layout.spinner_item)
+        adapter = ArrayAdapter<String>(inflater.context, R.layout.spinner_item)
 
-        spinner = view.findViewById(R.id.spinner)
+        spinner = view.requireViewById(R.id.spinner)
         spinner.adapter = adapter
 
-        channels.forEach { channel ->
-            adapter.add(getString(R.string.channel_name_format, channel.logicalSlotId))
+        return view
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        slotIds = requireArguments().getIntArray("slotIds")!!
+        logicalSlotIds = requireArguments().getIntArray("logicalSlotIds")!!
+        portIds = requireArguments().getIntArray("portIds")!!
+
+        logicalSlotIds.forEach { id ->
+            adapter.add(getString(R.string.channel_name_format, id))
         }
 
         toolbar.setNavigationOnClickListener {
             (requireActivity() as SlotSelectedListener).onSlotSelectCancelled()
         }
         toolbar.setOnMenuItemClickListener {
-            val channel = channels[spinner.selectedItemPosition]
-            (requireActivity() as SlotSelectedListener).onSlotSelected(channel.slotId, channel.portId)
+            val slotId = slotIds[spinner.selectedItemPosition]
+            val portId = portIds[spinner.selectedItemPosition]
+            (requireActivity() as SlotSelectedListener).onSlotSelected(slotId, portId)
             dismiss()
             true
         }
-
-        return view
     }
 
     override fun onResume() {

app-common/src/main/java/im/angry/openeuicc/ui/UsbCcidReaderFragment.kt

@@ -0,0 +1,169 @@
+package im.angry.openeuicc.ui
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.hardware.usb.UsbDevice
+import android.hardware.usb.UsbManager
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
+import androidx.lifecycle.lifecycleScope
+import im.angry.openeuicc.common.R
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.util.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * A wrapper fragment over EuiccManagementFragment where we handle
+ * logic specific to USB devices. This is mainly USB permission
+ * requests, and the fact that USB devices may or may not be
+ * available by the time the user selects it from MainActivity.
+ *
+ * Having this fragment allows MainActivity to be (mostly) agnostic
+ * of the underlying implementation of different types of channels.
+ * When permission is granted, this fragment will simply load
+ * EuiccManagementFragment using its own childFragmentManager.
+ *
+ * Note that for now we assume there will only be one USB card reader
+ * device. This is also an implicit assumption in EuiccChannelManager.
+ */
+class UsbCcidReaderFragment : Fragment(), OpenEuiccContextMarker {
+    companion object {
+        const val ACTION_USB_PERMISSION = "im.angry.openeuicc.USB_PERMISSION"
+    }
+
+    private val euiccChannelManager: EuiccChannelManager by lazy {
+        (requireActivity() as MainActivity).euiccChannelManager
+    }
+
+    private val usbManager: UsbManager by lazy {
+        requireContext().getSystemService(Context.USB_SERVICE) as UsbManager
+    }
+
+    private val usbPermissionReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action == ACTION_USB_PERMISSION) {
+                if (usbDevice != null && usbManager.hasPermission(usbDevice)) {
+                    lifecycleScope.launch(Dispatchers.Main) {
+                        tryLoadUsbChannel()
+                    }
+                }
+            }
+        }
+    }
+
+    private lateinit var usbPendingIntent: PendingIntent
+
+    private lateinit var text: TextView
+    private lateinit var permissionButton: Button
+    private lateinit var loadingProgress: ProgressBar
+
+    private var usbDevice: UsbDevice? = null
+    private var usbChannel: EuiccChannel? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.fragment_usb_ccid_reader, container, false)
+
+        text = view.requireViewById(R.id.usb_reader_text)
+        permissionButton = view.requireViewById(R.id.usb_grant_permission)
+        loadingProgress = view.requireViewById(R.id.loading)
+
+        permissionButton.setOnClickListener {
+            usbManager.requestPermission(usbDevice, usbPendingIntent)
+        }
+
+        return view
+    }
+
+    @SuppressLint("UnspecifiedRegisterReceiverFlag", "WrongConstant")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        usbPendingIntent = PendingIntent.getBroadcast(
+            requireContext(), 0,
+            Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE
+        )
+        val filter = IntentFilter(ACTION_USB_PERMISSION)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            requireContext().registerReceiver(
+                usbPermissionReceiver,
+                filter,
+                Context.RECEIVER_EXPORTED
+            )
+        } else {
+            requireContext().registerReceiver(usbPermissionReceiver, filter)
+        }
+
+        lifecycleScope.launch(Dispatchers.Main) {
+            tryLoadUsbChannel()
+        }
+    }
+
+    override fun onDetach() {
+        super.onDetach()
+        try {
+            requireContext().unregisterReceiver(usbPermissionReceiver)
+        } catch (_: Exception) {
+
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        try {
+            requireContext().unregisterReceiver(usbPermissionReceiver)
+        } catch (_: Exception) {
+
+        }
+    }
+
+    private suspend fun tryLoadUsbChannel() {
+        text.visibility = View.GONE
+        permissionButton.visibility = View.GONE
+        loadingProgress.visibility = View.VISIBLE
+
+        val (device, channel) = withContext(Dispatchers.IO) {
+            euiccChannelManager.enumerateUsbEuiccChannel()
+        }
+
+        loadingProgress.visibility = View.GONE
+
+        usbDevice = device
+        usbChannel = channel
+
+        if (device != null && channel == null && !usbManager.hasPermission(device)) {
+            text.text = getString(R.string.usb_permission_needed)
+            text.visibility = View.VISIBLE
+            permissionButton.visibility = View.VISIBLE
+        } else if (device != null && channel != null) {
+            childFragmentManager.commit {
+                replace(
+                    R.id.child_container,
+                    appContainer.uiComponentFactory.createEuiccManagementFragment(channel)
+                )
+            }
+        } else {
+            text.text = getString(R.string.usb_failed)
+            text.visibility = View.VISIBLE
+            permissionButton.visibility = View.GONE
+        }
+    }
+}

app-common/src/main/java/im/angry/openeuicc/util/EuiccChannelFragmentUtils.kt

@@ -3,6 +3,10 @@ package im.angry.openeuicc.util
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.ui.BaseEuiccAccessActivity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 interface EuiccChannelFragmentMarker: OpenEuiccContextMarker
 
@@ -19,11 +23,18 @@ fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments
     return instance
 }
 
+// Convenient methods to avoid using `channel` for these
+// `channel` requires that the channel actually exists in EuiccChannelManager, which is
+// not always the case during operations such as switching
 val <T> T.slotId: Int where T: Fragment, T: EuiccChannelFragmentMarker
     get() = requireArguments().getInt("slotId")
 val <T> T.portId: Int where T: Fragment, T: EuiccChannelFragmentMarker
     get() = requireArguments().getInt("portId")
+val <T> T.isUsb: Boolean where T: Fragment, T: EuiccChannelFragmentMarker
+    get() = requireArguments().getInt("slotId") == EuiccChannelManager.USB_CHANNEL_ID
 
+val <T> T.euiccChannelManager: EuiccChannelManager where T: Fragment, T: EuiccChannelFragmentMarker
+    get() = (requireActivity() as BaseEuiccAccessActivity).euiccChannelManager
 val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccChannelFragmentMarker
     get() =
         euiccChannelManager.findEuiccChannelByPortBlocking(slotId, portId)!!
@@ -31,3 +42,11 @@ val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccChannelFragmentMarker
 interface EuiccProfilesChangedListener {
     fun onEuiccProfilesChanged()
 }
+
+suspend fun <T> T.beginTrackedOperation(op: suspend () -> Boolean) where T: Fragment, T: EuiccChannelFragmentMarker {
+    withContext(Dispatchers.IO) {
+        euiccChannelManager.beginTrackedOperationBlocking(slotId, portId) {
+            op()
+        }
+    }
+}

app-common/src/main/java/im/angry/openeuicc/util/LPAUtils.kt

@@ -1,18 +1,106 @@
 package im.angry.openeuicc.util
 
+import android.util.Log
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.core.EuiccChannelManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.LocalProfileAssistant
 import net.typeblog.lpac_jni.LocalProfileInfo
 
+const val TAG = "LPAUtils"
+
 val LocalProfileInfo.displayName: String
     get() = nickName.ifEmpty { name }
 
+
+val LocalProfileInfo.isEnabled: Boolean
+    get() = state == LocalProfileInfo.State.Enabled
+
 val List<LocalProfileInfo>.operational: List<LocalProfileInfo>
     get() = filter {
         it.profileClass == LocalProfileInfo.Clazz.Operational
     }
 
-fun LocalProfileAssistant.disableActiveProfileWithUndo(): () -> Unit =
-    profiles.find { it.state == LocalProfileInfo.State.Enabled }?.let {
-        disableProfile(it.iccid)
+val List<EuiccChannel>.hasMultipleChips: Boolean
+    get() = distinctBy { it.slotId }.size > 1
+
+fun LocalProfileAssistant.switchProfile(
+    iccid: String,
+    enable: Boolean = false,
+    refresh: Boolean = false
+): Boolean =
+    if (enable) {
+        enableProfile(iccid, refresh)
+    } else {
+        disableProfile(iccid, refresh)
+    }
+
+/**
+ * Disable the current active profile if any. If refresh is true, also cause a refresh command.
+ * See EuiccManager.waitForReconnect()
+ */
+fun LocalProfileAssistant.disableActiveProfile(refresh: Boolean): Boolean =
+    profiles.find { it.isEnabled }?.let {
+        Log.i(TAG, "Disabling active profile ${it.iccid}")
+        disableProfile(it.iccid, refresh)
+    } ?: true
+
+/**
+ * Disable the active profile, return a lambda that reverts this action when called.
+ * If refreshOnDisable is true, also cause a eUICC refresh command. Note that refreshing
+ * will disconnect the eUICC and might need some time before being operational again.
+ * See EuiccManager.waitForReconnect()
+ */
+fun LocalProfileAssistant.disableActiveProfileWithUndo(refreshOnDisable: Boolean): () -> Unit =
+    profiles.find { it.isEnabled }?.let {
+        disableProfile(it.iccid, refreshOnDisable)
         return { enableProfile(it.iccid) }
     } ?: { }
+
+/**
+ * Begin a "tracked" operation where notifications may be generated by the eSIM
+ * Automatically handle any newly generated notification during the operation
+ * if the function "op" returns true.
+ *
+ * This requires the EuiccChannelManager object and a slotId / portId instead of
+ * just an LPA object, because a LPA might become invalid during an operation
+ * that generates notifications. As such, we will end up having to reconnect
+ * when this happens.
+ *
+ * Note that however, if reconnect is required and will not be instant, waiting
+ * should be the concern of op() itself, and this function assumes that when
+ * op() returns, the slotId and portId will correspond to a valid channel again.
+ */
+inline fun EuiccChannelManager.beginTrackedOperationBlocking(
+    slotId: Int,
+    portId: Int,
+    op: () -> Boolean
+) {
+    val latestSeq =
+        findEuiccChannelByPortBlocking(slotId, portId)!!.lpa.notifications.firstOrNull()?.seqNumber
+            ?: 0
+    Log.d(TAG, "Latest notification is $latestSeq before operation")
+    if (op()) {
+        Log.d(TAG, "Operation has requested notification handling")
+        try {
+            // Note that the exact instance of "channel" might have changed here if reconnected;
+            // so we MUST use the automatic getter for "channel"
+            findEuiccChannelByPortBlocking(
+                slotId,
+                portId
+            )?.lpa?.notifications?.filter { it.seqNumber > latestSeq }?.forEach {
+                Log.d(TAG, "Handling notification $it")
+                findEuiccChannelByPortBlocking(
+                    slotId,
+                    portId
+                )?.lpa?.handleNotification(it.seqNumber)
+            }
+        } catch (e: Exception) {
+            // Ignore any error during notification handling
+            e.printStackTrace()
+        }
+    }
+    Log.d(TAG, "Operation complete")
+}

app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt

@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.map
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "prefs")
 
 val Context.preferenceRepository: PreferenceRepository
-    get() = (applicationContext as OpenEuiccApplication).preferenceRepository
+    get() = (applicationContext as OpenEuiccApplication).appContainer.preferenceRepository
 
 val Fragment.preferenceRepository: PreferenceRepository
     get() = requireContext().preferenceRepository
@@ -22,8 +22,9 @@ val Fragment.preferenceRepository: PreferenceRepository
 object PreferenceKeys {
     val NOTIFICATION_DOWNLOAD = booleanPreferencesKey("notification_download")
     val NOTIFICATION_DELETE = booleanPreferencesKey("notification_delete")
-    val NOTIFICATION_ENABLE = booleanPreferencesKey("notification_enable")
-    val NOTIFICATION_DISABLE = booleanPreferencesKey("notification_disable")
+    val NOTIFICATION_SWITCH = booleanPreferencesKey("notification_switch")
+    val DISABLE_SAFEGUARD_REMOVABLE_ESIM = booleanPreferencesKey("disable_safeguard_removable_esim")
+    val OPERATIONAL_PROFILES_ONLY = booleanPreferencesKey("operational_profiles_only")
 }
 
 class PreferenceRepository(context: Context) {
@@ -37,12 +38,15 @@ class PreferenceRepository(context: Context) {
     val notificationDeleteFlow: Flow<Boolean> =
         dataStore.data.map { it[PreferenceKeys.NOTIFICATION_DELETE] ?: true }
 
-    // Enabling / disabling notifications are not sent by default
-    val notificationEnableFlow: Flow<Boolean> =
-        dataStore.data.map { it[PreferenceKeys.NOTIFICATION_ENABLE] ?: false }
+    val notificationSwitchFlow: Flow<Boolean> =
+        dataStore.data.map { it[PreferenceKeys.NOTIFICATION_SWITCH] ?: false }
 
-    val notificationDisableFlow: Flow<Boolean> =
-        dataStore.data.map { it[PreferenceKeys.NOTIFICATION_DISABLE] ?: false }
+    // ---- Advanced ----
+    val disableSafeguardFlow: Flow<Boolean> =
+        dataStore.data.map { it[PreferenceKeys.DISABLE_SAFEGUARD_REMOVABLE_ESIM] ?: false }
+
+    val operationalOnlyFlow: Flow<Boolean> =
+        dataStore.data.map { it[PreferenceKeys.OPERATIONAL_PROFILES_ONLY] ?: true }
 
     suspend fun <T> updatePreference(key: Preferences.Key<T>, value: T) {
         dataStore.edit {

app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt

@@ -20,3 +20,11 @@ fun ByteArray.encodeHex(): String {
     }
     return sb.toString()
 }
+
+fun formatFreeSpace(size: Int): String =
+    // SIM cards probably won't have much more space anytime soon.
+    if (size >= 1024) {
+        "%.2f KiB".format(size.toDouble() / 1024)
+    } else {
+        "$size B"
+    }

app-common/src/main/java/im/angry/openeuicc/util/Utils.kt

@@ -2,17 +2,22 @@ package im.angry.openeuicc.util
 
 import android.content.Context
 import android.content.pm.PackageManager
+import android.graphics.Bitmap
 import android.se.omapi.SEService
 import android.telephony.TelephonyManager
 import androidx.fragment.app.Fragment
+import com.google.zxing.BinaryBitmap
+import com.google.zxing.RGBLuminanceSource
+import com.google.zxing.common.HybridBinarizer
+import com.google.zxing.qrcode.QRCodeReader
 import im.angry.openeuicc.OpenEuiccApplication
-import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.di.AppContainer
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import net.typeblog.lpac_jni.LocalProfileInfo
-import java.lang.RuntimeException
+import kotlinx.coroutines.withContext
+import kotlin.RuntimeException
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
@@ -21,11 +26,20 @@ val Context.selfAppVersion: String
     get() =
         try {
             val pInfo = packageManager.getPackageInfo(packageName, 0)
-            pInfo.versionName
+            pInfo.versionName!!
         } catch (e: PackageManager.NameNotFoundException) {
             throw RuntimeException(e)
         }
 
+suspend fun readSelfLog(lines: Int = 2048): String = withContext(Dispatchers.IO) {
+    try {
+        Runtime.getRuntime().exec("logcat -t $lines").inputStream.readBytes()
+            .decodeToString()
+    } catch (_: Exception) {
+        ""
+    }
+}
+
 interface OpenEuiccContextMarker {
     val openEuiccMarkerContext: Context
         get() = when (this) {
@@ -37,19 +51,13 @@ interface OpenEuiccContextMarker {
     val openEuiccApplication: OpenEuiccApplication
         get() = openEuiccMarkerContext.applicationContext as OpenEuiccApplication
 
-    val euiccChannelManager: EuiccChannelManager
-        get() = openEuiccApplication.euiccChannelManager
+    val appContainer: AppContainer
+        get() = openEuiccApplication.appContainer
 
     val telephonyManager: TelephonyManager
-        get() = openEuiccApplication.telephonyManager
+        get() = appContainer.telephonyManager
 }
 
-val LocalProfileInfo.isEnabled: Boolean
-    get() = state == LocalProfileInfo.State.Enabled
-
-val List<EuiccChannel>.hasMultipleChips: Boolean
-    get() = distinctBy { it.slotId }.size > 1
-
 // Create an instance of OMAPI SEService in a manner that "makes sense" without unpredictable callbacks
 suspend fun connectSEService(context: Context): SEService = suspendCoroutine { cont ->
     // Use a Mutex to make sure the continuation is run *after* the "service" variable is assigned
@@ -77,3 +85,14 @@ suspend fun connectSEService(context: Context): SEService = suspendCoroutine { c
         }
     }
 }
+
+fun decodeQrFromBitmap(bmp: Bitmap): String? =
+     runCatching {
+        val pixels = IntArray(bmp.width * bmp.height)
+        bmp.getPixels(pixels, 0, bmp.width, 0, 0, bmp.width, bmp.height)
+
+        val luminanceSource = RGBLuminanceSource(bmp.width, bmp.height, pixels)
+        val binaryBmp = BinaryBitmap(HybridBinarizer(luminanceSource))
+
+        QRCodeReader().decode(binaryBmp).text
+    }.getOrNull()

app-common/src/main/res/drawable/ic_gallery_black.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
+</vector>

app-common/src/main/res/drawable/ic_refresh_black.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>

app-common/src/main/res/drawable/ic_save_as_black.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,12.4V7l-4,-4H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h7.4L21,12.4zM15,15c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3s1.34,-3 3,-3S15,13.34 15,15zM6,6h9v4H6V6zM19.99,16.25l1.77,1.77L16.77,23H15v-1.77L19.99,16.25zM23.25,16.51l-0.85,0.85l-1.77,-1.77l0.85,-0.85c0.2,-0.2 0.51,-0.2 0.71,0l1.06,1.06C23.45,16 23.45,16.32 23.25,16.51z"/>
+</vector>

app-common/src/main/res/layout/activity_main.xml

@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.MainActivity">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
@@ -14,22 +13,35 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintWidth_percent="1" />
 
-    <FrameLayout
-        android:id="@+id/fragment_root"
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/main_tabs"
+        android:background="?attr/colorSurfaceVariant"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:tabTextColor="?attr/colorOnSurfaceVariant"
+        app:tabSelectedTextColor="?attr/colorOnSurfaceVariant"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/main_tabs"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
-        <TextView
-            android:id="@+id/no_euicc_placeholder"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="40dp"
-            android:layout_marginEnd="40dp"
-            android:gravity="center"
-            android:text="@string/no_euicc" />
-    </FrameLayout>
+        app:layout_constraintTop_toBottomOf="@id/main_tabs"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app-common/src/main/res/layout/footer_no_profile.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginTop="6dp"
+        android:gravity="center"
+        android:text="@string/no_profile"
+        android:textStyle="italic"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app-common/src/main/res/layout/fragment_euicc.xml

@@ -25,7 +25,7 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:src="@drawable/ic_add"
         app:layout_constraintRight_toRightOf="parent"

app-common/src/main/res/layout/fragment_no_euicc_placeholder.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/no_euicc_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:gravity="center"
+        android:text="@string/no_euicc" />
+</FrameLayout>

app-common/src/main/res/layout/fragment_usb_ccid_reader.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <TextView
+        android:id="@+id/usb_reader_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="40dp"
+        android:gravity="center"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <Button
+        android:id="@+id/usb_grant_permission"
+        android:text="@string/usb_permission"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/usb_reader_text"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <FrameLayout
+        android:id="@+id/child_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app-common/src/main/res/menu/activity_logs.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/save"
+        android:icon="@drawable/ic_save_as_black"
+        android:title="@string/logs_save"
+        app:showAsAction="always" />
+</menu>

app-common/src/main/res/menu/activity_main.xml

@@ -2,10 +2,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/spinner"
-        android:title=""
-        app:actionViewClass="android.widget.Spinner"
-        app:showAsAction="always" />
+        android:id="@+id/reload"
+        android:title="@string/reload"
+        android:icon="@drawable/ic_refresh_black"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/settings"

app-common/src/main/res/menu/fragment_profile_download.xml

@@ -7,9 +7,15 @@
         android:title="@string/profile_download_scan"
         app:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/scan_from_gallery"
+        android:icon="@drawable/ic_gallery_black"
+        android:title="@string/profile_download_scan_from_gallery"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/ok"
         android:icon="@drawable/ic_check_black"
         android:title="@string/profile_download_ok"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="always"/>
 </menu>

app-common/src/main/res/raw/symantec_gsma_rspv2_root_ci1

@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICSTCCAe+gAwIBAgIQbmhWeneg7nyF7hg5Y9+qejAKBggqhkjOPQQDAjBEMRgw
-FgYDVQQKEw9HU00gQXNzb2NpYXRpb24xKDAmBgNVBAMTH0dTTSBBc3NvY2lhdGlv
-biAtIFJTUDIgUm9vdCBDSTEwIBcNMTcwMjIyMDAwMDAwWhgPMjA1MjAyMjEyMzU5
-NTlaMEQxGDAWBgNVBAoTD0dTTSBBc3NvY2lhdGlvbjEoMCYGA1UEAxMfR1NNIEFz
-c29jaWF0aW9uIC0gUlNQMiBSb290IENJMTBZMBMGByqGSM49AgEGCCqGSM49AwEH
-A0IABJ1qutL0HCMX52GJ6/jeibsAqZfULWj/X10p/Min6seZN+hf5llovbCNuB2n
-unLz+O8UD0SUCBUVo8e6n9X1TuajgcAwgb0wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wEwYDVR0RBAwwCogIKwYBBAGC6WAwFwYDVR0gAQH/BA0wCzAJ
-BgdngRIBAgEAME0GA1UdHwRGMEQwQqBAoD6GPGh0dHA6Ly9nc21hLWNybC5zeW1h
-dXRoLmNvbS9vZmZsaW5lY2EvZ3NtYS1yc3AyLXJvb3QtY2kxLmNybDAdBgNVHQ4E
-FgQUgTcPUSXQsdQI1MOyMubSXnlb6/swCgYIKoZIzj0EAwIDSAAwRQIgIJdYsOMF
-WziPK7l8nh5mu0qiRiVf25oa9ullG/OIASwCIQDqCmDrYf+GziHXBOiwJwnBaeBO
-aFsiLzIEOaUuZwdNUw==
------END CERTIFICATE-----

app-common/src/main/res/values/strings.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="no_euicc">No eUICC card on this device is accessible by this app.\nInsert a supported eUICC card, or try out the privileged OpenEUICC app instead.</string>
+    <string name="no_euicc">No removable eUICC card accessible by this app is detected on this device. Insert a compatible card or a USB reader.</string>
+    <string name="no_profile">No profiles (yet) on this eSIM.</string>
     <string name="unknown">Unknown</string>
     <string name="help">Help</string>
+    <string name="reload">Reload Slots</string>
 
     <string name="channel_name_format">Logical Slot %d</string>
+    <string name="usb">USB</string>
 
     <string name="enabled">Enabled</string>
     <string name="disabled">Disabled</string>
@@ -16,12 +19,20 @@
     <string name="delete">Delete</string>
     <string name="rename">Rename</string>
 
+    <string name="enable_disable_timeout">Timed out waiting for the eSIM chip to switch profiles. This may be a bug in your phone\'s modem firmware. Try toggling airplane mode, restarting the application, or rebooting the phone.</string>
+    <string name="switch_did_not_refresh">The operation was successful, but your phone\'s modem refused to refresh. You might need to toggle airplane mode or reboot in order to use the new profile.</string>
+
     <string name="toast_profile_enable_failed">Cannot switch to new eSIM profile.</string>
     <string name="toast_profile_name_too_long">Nickname cannot be longer than 64 characters</string>
+    <string name="toast_iccid_copied">ICCID copied to clipboard</string>
 
     <string name="slot_select">Select Slot</string>
     <string name="slot_select_select">Select</string>
 
+    <string name="usb_permission">Grant USB permission</string>
+    <string name="usb_permission_needed">Permission is needed to access the USB smart card reader.</string>
+    <string name="usb_failed">Cannot connect to eSIM via a USB smart card reader.</string>
+
     <string name="profile_download">New eSIM</string>
     <string name="profile_download_server">Server (RSP / SM-DP+)</string>
     <string name="profile_download_code">Activation Code</string>
@@ -29,14 +40,17 @@
     <string name="profile_download_imei">IMEI (Optional)</string>
     <string name="profile_download_free_space">Space remaining: %s</string>
     <string name="profile_download_scan">Scan QR Code</string>
+    <string name="profile_download_scan_from_gallery">Scan QR Code from Gallery</string>
     <string name="profile_download_ok">Download</string>
     <string name="profile_download_failed">Failed to download eSIM. Check your activation / QR code.</string>
 
     <string name="profile_rename_new_name">New nickname</string>
 
     <string name="profile_delete_confirm">Are you sure you want to delete the profile %s? This operation is irreversible.</string>
+    <string name="profile_delete_confirm_input">Type \'%s\' here to confirm deletion</string>
 
-    <string name="profile_notifications">Profile Notifications</string>
+    <string name="profile_notifications">Notifications</string>
+    <string name="profile_notifications_detailed_format">Notifications (%s)</string>
     <string name="profile_notifications_show">Manage Notifications</string>
     <string name="profile_notifications_help">eSIM profiles can send notifications to the carrier when they are downloaded, deleted, enabled, or disabled. The queue of these notifications to be sent is listed here.\n\nIn Settings, you can specify whether to send each type of notification automatically. Note that even if a notification has been sent, it will not be deleted automatically from the record, unless the queue runs out of space.\n\nHere, you can manually send or delete each pending notification.</string>
     <string name="profile_notification_operation_download">Downloaded</string>
@@ -47,6 +61,9 @@
     <string name="profile_notification_process">Process</string>
     <string name="profile_notification_delete">Delete</string>
 
+    <string name="logs_save">Save</string>
+    <string name="logs_filename_template">Logs at %s</string>
+
     <string name="pref_settings">Settings</string>
     <string name="pref_notifications">Notifications</string>
     <string name="pref_notifications_desc">eSIM profile operations send notifications to the carrier. Fine-tune this behavior as needed here.</string>
@@ -54,11 +71,13 @@
     <string name="pref_notifications_download_desc">Send notifications for <i>downloading</i> profiles</string>
     <string name="pref_notifications_delete">Deletion</string>
     <string name="pref_notifications_delete_desc">Send notifications for <i>deleting</i> profiles</string>
-    <string name="pref_notifications_enable">Enabling</string>
-    <string name="pref_notifications_enable_desc">Send notifications for <i>enabling</i> profiles\nNote that this type of notification is unreliable.</string>
-    <string name="pref_notifications_disable">Disabling</string>
-    <string name="pref_notifications_disable_desc">Send notifications for <i>disabling</i> profiles\nNote that this type of notification is unreliable.</string>
+    <string name="pref_notifications_switch">Switching</string>
+    <string name="pref_notifications_switch_desc">Send notifications for <i>switching</i> profiles\nNote that this type of notification is unreliable.</string>
     <string name="pref_advanced">Advanced</string>
+    <string name="pref_advanced_disable_safeguard_removable_esim">Disable Safeguards for Removable eSIMs</string>
+    <string name="pref_advanced_disable_safeguard_removable_esim_desc">By default, this app prevents you from disabling the active profile on a removable eSIM inserted in the device, because doing so may <i>sometimes</i> render it inaccessible.\nCheck this box to <i>remove</i> this safeguard.</string>
+    <string name="pref_advanced_operational_profiles_only">Display only operational profiles</string>
+    <string name="pref_advanced_operational_profiles_only_desc">By default, this app lists only <i>operational</i> profiles. You can disable this to also see (and manage) <i>testing</i> and <i>bootstrap</i> profiles.</string>
     <string name="pref_advanced_logs">Logs</string>
     <string name="pref_advanced_logs_desc">View recent debug logs of the application</string>
     <string name="pref_info">Info</string>

app-common/src/main/res/xml/network_security_config.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <base-config>
-        <trust-anchors>
-            <certificates src="@raw/symantec_gsma_rspv2_root_ci1"/>
-            <certificates src="system"/>
-        </trust-anchors>
-    </base-config>
-</network-security-config>

app-common/src/main/res/xml/pref_settings.xml

@@ -16,19 +16,25 @@
             app:key="pref_notifications_delete" />
         <CheckBoxPreference
             app:iconSpaceReserved="false"
-            app:title="@string/pref_notifications_enable"
-            app:summary="@string/pref_notifications_enable_desc"
-            app:key="pref_notifications_enable" />
-        <CheckBoxPreference
-            app:iconSpaceReserved="false"
-            app:title="@string/pref_notifications_disable"
-            app:summary="@string/pref_notifications_disable_desc"
-            app:key="pref_notifications_disable" />
+            app:title="@string/pref_notifications_switch"
+            app:summary="@string/pref_notifications_switch_desc"
+            app:key="pref_notifications_switch" />
     </im.angry.openeuicc.ui.preference.LongSummaryPreferenceCategory>
 
     <PreferenceCategory
         app:title="@string/pref_advanced"
         app:iconSpaceReserved="false">
+        <CheckBoxPreference
+            app:key="pref_advanced_disable_safeguard_removable_esim"
+            app:iconSpaceReserved="false"
+            app:title="@string/pref_advanced_disable_safeguard_removable_esim"
+            app:summary="@string/pref_advanced_disable_safeguard_removable_esim_desc" />
+        <CheckBoxPreference
+            app:key="pref_advanced_operational_profiles_only"
+            app:iconSpaceReserved="false"
+            app:title="@string/pref_advanced_operational_profiles_only"
+            app:summary="@string/pref_advanced_operational_profiles_only_desc" />
+
         <Preference
             app:key="pref_advanced_logs"
             app:iconSpaceReserved="false"

app-deps/Android.bp

@@ -10,6 +10,7 @@ java_defaults {
         "androidx.lifecycle_lifecycle-runtime-ktx",
         "androidx.swiperefreshlayout_swiperefreshlayout",
         "androidx.cardview_cardview",
+        "androidx.viewpager2_viewpager2",
         "OpenEUICC_androidx.datastore_datastore-preferences",
         "OpenEUICC_com.journeyapps_zxing-android-embedded",
     ],

app-deps/build.gradle.kts

@@ -50,6 +50,7 @@ dependencies {
     api("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
     api("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     api("androidx.cardview:cardview:1.0.0")
+    api("androidx.viewpager2:viewpager2:1.1.0")
     api("androidx.datastore:datastore-preferences:1.0.0")
     api("com.journeyapps:zxing-android-embedded:4.3.0")
     testImplementation("junit:junit:4.13.2")

app-unpriv/build.gradle.kts

@@ -18,6 +18,7 @@ apply {
 android {
     namespace = "im.angry.easyeuicc"
     compileSdk = 34
+    ndkVersion = "26.1.10909125"
 
     defaultConfig {
         applicationId = "im.angry.easyeuicc"

app-unpriv/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-        android:name="im.angry.openeuicc.OpenEuiccApplication"
+        android:name="im.angry.openeuicc.UnprivilegedOpenEuiccApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt

@@ -0,0 +1,29 @@
+package im.angry.openeuicc
+
+import android.content.Intent
+import im.angry.openeuicc.di.UnprivilegedAppContainer
+import im.angry.openeuicc.ui.LogsActivity
+import im.angry.openeuicc.util.*
+import kotlinx.coroutines.runBlocking
+import kotlin.system.exitProcess
+
+class UnprivilegedOpenEuiccApplication : OpenEuiccApplication() {
+    override val appContainer by lazy {
+        UnprivilegedAppContainer(this)
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+
+        Thread.setDefaultUncaughtExceptionHandler { _, e ->
+            e.printStackTrace()
+            Intent(this, LogsActivity::class.java).apply {
+                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                putExtra("log", runBlocking { readSelfLog() })
+                startActivity(this)
+                exitProcess(-1)
+            }
+        }
+    }
+}

app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt

@@ -0,0 +1,9 @@
+package im.angry.openeuicc.di
+
+import android.content.Context
+
+class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context) {
+    override val uiComponentFactory by lazy {
+        UnprivilegedUiComponentFactory()
+    }
+}

app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedUiComponentFactory.kt

@@ -0,0 +1,9 @@
+package im.angry.openeuicc.di
+
+import androidx.fragment.app.Fragment
+import im.angry.openeuicc.ui.UnprivilegedNoEuiccPlaceholderFragment
+
+class UnprivilegedUiComponentFactory : DefaultUiComponentFactory() {
+    override fun createNoEuiccPlaceholderFragment(): Fragment =
+        UnprivilegedNoEuiccPlaceholderFragment()
+}

app-unpriv/src/main/java/im/angry/openeuicc/ui/CompatibilityCheckActivity.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.children
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -23,10 +24,10 @@ class CompatibilityCheckActivity: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_compatibility_check)
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(requireViewById(R.id.toolbar))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
-        compatibilityCheckList = findViewById(R.id.recycler_view)
+        compatibilityCheckList = requireViewById(R.id.recycler_view)
         compatibilityCheckList.layoutManager =
             LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         compatibilityCheckList.addItemDecoration(DividerItemDecoration(this, LinearLayoutManager.VERTICAL))
@@ -50,22 +51,30 @@ class CompatibilityCheckActivity: AppCompatActivity() {
         }
 
     inner class ViewHolder(private val root: View): RecyclerView.ViewHolder(root) {
-        private val titleView: TextView = root.findViewById(R.id.compatibility_check_title)
-        private val descView: TextView = root.findViewById(R.id.compatibility_check_desc)
+        private val titleView: TextView = root.requireViewById(R.id.compatibility_check_title)
+        private val descView: TextView = root.requireViewById(R.id.compatibility_check_desc)
+        private val statusContainer: ViewGroup = root.requireViewById(R.id.compatibility_check_status_container)
 
         fun bindItem(item: CompatibilityCheck) {
             titleView.text = item.title
             descView.text = item.description
 
+            statusContainer.children.forEach {
+                it.visibility = View.GONE
+            }
+
             when (item.state) {
                 CompatibilityCheck.State.SUCCESS -> {
-                    root.findViewById<View>(R.id.compatibility_check_checkmark).visibility = View.VISIBLE
+                    root.requireViewById<View>(R.id.compatibility_check_checkmark).visibility = View.VISIBLE
                 }
                 CompatibilityCheck.State.FAILURE -> {
-                    root.findViewById<View>(R.id.compatibility_check_error).visibility = View.VISIBLE
+                    root.requireViewById<View>(R.id.compatibility_check_error).visibility = View.VISIBLE
+                }
+                CompatibilityCheck.State.FAILURE_UNKNOWN -> {
+                    root.requireViewById<View>(R.id.compatibility_check_unknown).visibility = View.VISIBLE
                 }
                 else -> {
-                    root.findViewById<View>(R.id.compatibility_check_progress_bar).visibility = View.VISIBLE
+                    root.requireViewById<View>(R.id.compatibility_check_progress_bar).visibility = View.VISIBLE
                 }
             }
         }

app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedNoEuiccPlaceholderFragment.kt

@@ -0,0 +1,29 @@
+package im.angry.openeuicc.ui
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import im.angry.easyeuicc.R
+
+class UnprivilegedNoEuiccPlaceholderFragment : Fragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(
+            R.layout.fragment_no_euicc_placeholder_unprivileged,
+            container,
+            false
+        )
+
+        view.findViewById<View>(R.id.compatibility_check).setOnClickListener {
+            startActivity(Intent(requireContext(), CompatibilityCheckActivity::class.java))
+        }
+
+        return view
+    }
+}

app-unpriv/src/main/java/im/angry/openeuicc/util/CompatibilityCheck.kt

@@ -9,18 +9,24 @@ import im.angry.easyeuicc.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
+import java.io.IOException
 
 fun getCompatibilityChecks(context: Context): List<CompatibilityCheck> =
     listOf(
         HasSystemFeaturesCheck(context),
         OmapiConnCheck(context),
         IsdrChannelAccessCheck(context),
-        KnownBrokenCheck(context)
+        KnownBrokenCheck(context),
+        UsbCheck(context),
+        Verdict(context),
     )
 
+inline fun <reified T: CompatibilityCheck> List<CompatibilityCheck>.findCheck(): T? =
+    find { it.javaClass == T::class.java }?.let { it as T }
+
 suspend fun List<CompatibilityCheck>.executeAll(callback: () -> Unit) = withContext(Dispatchers.IO) {
     forEach {
-        it.run()
+        it.run(this@executeAll)
         withContext(Dispatchers.Main) {
             callback()
         }
@@ -38,6 +44,7 @@ abstract class CompatibilityCheck(context: Context) {
         NOT_STARTED,
         IN_PROGRESS,
         SUCCESS,
+        FAILURE_UNKNOWN, // The check technically failed, but no conclusion can be drawn
         FAILURE
     }
 
@@ -45,25 +52,23 @@ abstract class CompatibilityCheck(context: Context) {
 
     abstract val title: String
     protected abstract val defaultDescription: String
+    protected lateinit var successDescription: String
     protected lateinit var failureDescription: String
 
     val description: String
         get() = when {
-            state == State.FAILURE && this::failureDescription.isInitialized -> failureDescription
+            (state == State.FAILURE || state == State.FAILURE_UNKNOWN) && this::failureDescription.isInitialized -> failureDescription
+            state == State.SUCCESS && this::successDescription.isInitialized -> successDescription
             else -> defaultDescription
         }
 
-    protected abstract suspend fun doCheck(): Boolean
+    protected abstract suspend fun doCheck(allChecks: List<CompatibilityCheck>): State
 
-    suspend fun run() {
+    suspend fun run(allChecks: List<CompatibilityCheck>) {
         state = State.IN_PROGRESS
         delay(200)
         state = try {
-            if (doCheck()) {
-                State.SUCCESS
-            } else {
-                State.FAILURE
-            }
+            doCheck(allChecks)
         } catch (_: Exception) {
             State.FAILURE
         }
@@ -76,10 +81,10 @@ internal class HasSystemFeaturesCheck(private val context: Context): Compatibili
     override val defaultDescription: String
         get() = context.getString(R.string.compatibility_check_system_features_desc)
 
-    override suspend fun doCheck(): Boolean {
+    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
         if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
             failureDescription = context.getString(R.string.compatibility_check_system_features_no_telephony)
-            return false
+            return State.FAILURE
         }
 
         // We can check OMAPI UICC availability on R or later (if before R, we check OMAPI connectivity later)
@@ -87,10 +92,10 @@ internal class HasSystemFeaturesCheck(private val context: Context): Compatibili
             PackageManager.FEATURE_SE_OMAPI_UICC
         )) {
             failureDescription = context.getString(R.string.compatibility_check_system_features_no_omapi)
-            return false
+            return State.FAILURE_UNKNOWN
         }
 
-        return true
+        return State.SUCCESS
     }
 }
 
@@ -100,25 +105,25 @@ internal class OmapiConnCheck(private val context: Context): CompatibilityCheck(
     override val defaultDescription: String
         get() = context.getString(R.string.compatibility_check_omapi_connectivity_desc)
 
-    override suspend fun doCheck(): Boolean {
+    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
         val seService = connectSEService(context)
         if (!seService.isConnected) {
             failureDescription = context.getString(R.string.compatibility_check_omapi_connectivity_fail)
-            return false
+            return State.FAILURE
         }
 
         val tm = context.getSystemService(TelephonyManager::class.java)
         val simReaders = seService.readers.filter { it.isSIM }
         if (simReaders.isEmpty()) {
             failureDescription = context.getString(R.string.compatibility_check_omapi_connectivity_fail)
-            return false
+            return State.FAILURE_UNKNOWN
         } else if (simReaders.size < tm.activeModemCountCompat) {
-            failureDescription = context.getString(R.string.compatibility_check_omapi_connectivity_fail_sim_number,
+            successDescription = context.getString(R.string.compatibility_check_omapi_connectivity_partial_success_sim_number,
                 simReaders.map { it.slotIndex }.joinToString(", "))
-            return false
+            return State.SUCCESS
         }
 
-        return true
+        return State.SUCCESS
     }
 }
 
@@ -132,30 +137,44 @@ internal class IsdrChannelAccessCheck(private val context: Context): Compatibili
     override val defaultDescription: String
         get() = context.getString(R.string.compatibility_check_isdr_channel_desc)
 
-    override suspend fun doCheck(): Boolean {
+    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
         val seService = connectSEService(context)
-        val (validSlotIds, result) = seService.readers.filter { it.isSIM }.map {
+        val readers = seService.readers.filter { it.isSIM }
+        if (readers.isEmpty()) {
+            failureDescription = context.getString(R.string.compatibility_check_isdr_channel_desc_unknown)
+            return State.FAILURE_UNKNOWN
+        }
+
+        val (validSlotIds, result) = readers.map {
             try {
                 it.openSession().openLogicalChannel(ISDR_AID)?.close()
-                Pair(it.slotIndex, true)
+                Pair(it.slotIndex, State.SUCCESS)
             } catch (_: SecurityException) {
                 // Ignore; this is expected when everything works
                 // ref: https://android.googlesource.com/platform/frameworks/base/+/4fe64fb4712a99d5da9c9a0eb8fd5169b252e1e1/omapi/java/android/se/omapi/Session.java#305
                 // SecurityException is only thrown when Channel is constructed, which means everything else needs to succeed
-                Pair(it.slotIndex, true)
+                Pair(it.slotIndex, State.SUCCESS)
+            } catch (e: IOException) {
+                e.printStackTrace()
+                if (e.message?.contains("Secure Element is not present") == true) {
+                    failureDescription = context.getString(R.string.compatibility_check_isdr_channel_desc_unknown)
+                    Pair(it.slotIndex, State.FAILURE_UNKNOWN)
+                } else {
+                    Pair(it.slotIndex, State.FAILURE)
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
-                Pair(it.slotIndex, false)
+                Pair(it.slotIndex, State.FAILURE)
             }
-        }.fold(Pair(mutableListOf<Int>(), true)) { (ids, result), (id, ok) ->
-            if (!ok) {
-                Pair(ids, false)
+        }.fold(Pair(mutableListOf<Int>(), State.SUCCESS)) { (ids, result), (id, ok) ->
+            if (ok != State.SUCCESS) {
+                Pair(ids, ok)
             } else {
                 Pair(ids.apply { add(id) }, result)
             }
         }
 
-        if (!result && validSlotIds.size > 0) {
+        if (result != State.SUCCESS && validSlotIds.size > 0) {
             if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC)) {
                 failureDescription = context.getString(
                     R.string.compatibility_check_isdr_channel_desc_partial_fail,
@@ -164,7 +183,7 @@ internal class IsdrChannelAccessCheck(private val context: Context): Compatibili
             } else {
                 // If the device has embedded eSIMs, we can likely ignore the failure here;
                 // the OMAPI failure likely resulted from trying to access internal eSIMs.
-                return true
+                return State.SUCCESS
             }
         }
 
@@ -174,7 +193,7 @@ internal class IsdrChannelAccessCheck(private val context: Context): Compatibili
 
 internal class KnownBrokenCheck(private val context: Context): CompatibilityCheck(context) {
     companion object {
-        val BROKEN_MANUFACTURERS = arrayOf("xiaomi")
+        val BROKEN_MANUFACTURERS = arrayOf("xiaomi", "huawei", "honor")
     }
 
     override val title: String
@@ -186,6 +205,77 @@ internal class KnownBrokenCheck(private val context: Context): CompatibilityChec
         failureDescription = context.getString(R.string.compatibility_check_known_broken_fail)
     }
 
-    override suspend fun doCheck(): Boolean =
-        Build.MANUFACTURER.lowercase() !in BROKEN_MANUFACTURERS
+    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State =
+        if (Build.MANUFACTURER.lowercase() in BROKEN_MANUFACTURERS) {
+            State.FAILURE
+        } else {
+            State.SUCCESS
+        }
+}
+
+internal class UsbCheck(private val context: Context) : CompatibilityCheck(context) {
+    override val title: String
+        get() = context.getString(R.string.compatibility_check_usb)
+    override val defaultDescription: String
+        get() = context.getString(R.string.compatibility_check_usb_desc)
+
+    init {
+        successDescription = context.getString(R.string.compatibility_check_usb_ok)
+        failureDescription = context.getString(R.string.compatibility_check_usb_fail)
+    }
+
+    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State =
+        if (context.packageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {
+            State.SUCCESS
+        } else {
+            State.FAILURE
+        }
+
+}
+
+internal class Verdict(private val context: Context) : CompatibilityCheck(context) {
+    override val title: String
+        get() = context.getString(R.string.compatibility_check_verdict)
+    override val defaultDescription: String
+        get() = context.getString(R.string.compatibility_check_verdict_desc)
+
+    override suspend fun doCheck(allChecks: List<CompatibilityCheck>): State {
+        if (allChecks.findCheck<KnownBrokenCheck>()?.state == State.FAILURE) {
+            failureDescription = context.getString(
+                R.string.compatibility_check_verdict_known_broken,
+                context.getString(R.string.compatibility_check_verdict_fail_shared)
+            )
+            return State.FAILURE
+        }
+
+        if (allChecks.findCheck<OmapiConnCheck>()?.state == State.SUCCESS &&
+            allChecks.findCheck<IsdrChannelAccessCheck>()?.state == State.SUCCESS
+        ) {
+            successDescription = context.getString(R.string.compatibility_check_verdict_ok)
+            return State.SUCCESS
+        }
+
+        if (allChecks.findCheck<OmapiConnCheck>()?.state == State.FAILURE_UNKNOWN ||
+            allChecks.findCheck<IsdrChannelAccessCheck>()?.state == State.FAILURE_UNKNOWN
+        ) {
+            // We are not sure because we can't fully check OMAPI
+            // however we can guess based on feature flags
+            // TODO: We probably need a "known-good" list for these devices as well?
+            failureDescription = context.getString(
+                if (allChecks.findCheck<HasSystemFeaturesCheck>()?.state == State.SUCCESS) {
+                    R.string.compatibility_check_verdict_unknown_likely_ok
+                } else {
+                    R.string.compatibility_check_verdict_unknown_likely_fail
+                },
+                context.getString(R.string.compatibility_check_verdict_fail_shared)
+            )
+            return State.FAILURE_UNKNOWN
+        }
+
+        failureDescription = context.getString(
+            R.string.compatibility_check_verdict_unknown,
+            context.getString(R.string.compatibility_check_verdict_fail_shared)
+        )
+        return State.FAILURE_UNKNOWN
+    }
 }

app-unpriv/src/main/res/drawable/ic_question_outline.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="?attr/colorControlNormal" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
+</vector>

app-unpriv/src/main/res/layout/compatibility_check_item.xml

@@ -60,6 +60,14 @@
             android:layout_width="32dp"
             android:layout_height="32dp" />
 
+        <ImageView
+            android:id="@+id/compatibility_check_unknown"
+            android:src="@drawable/ic_question_outline"
+            android:visibility="gone"
+            android:layout_gravity="center"
+            android:layout_width="32dp"
+            android:layout_height="32dp" />
+
     </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app-unpriv/src/main/res/layout/fragment_no_euicc_placeholder_unprivileged.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/no_euicc_placeholder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="40dp"
+        android:layout_marginEnd="40dp"
+        android:gravity="center"
+        android:text="@string/no_euicc"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/compatibility_check"
+        android:text="@string/compatibility_check"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintTop_toBottomOf="@id/no_euicc_placeholder"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app-unpriv/src/main/res/values/strings.xml

@@ -1,20 +1,34 @@
 <resources>
     <string name="app_name" translatable="false">EasyEUICC</string>
+    <string name="channel_name_format">SIM %d</string>
     <string name="compatibility_check">Compatibility Check</string>
 
     <!-- Compatibility Check Descriptions -->
     <string name="compatibility_check_system_features">System Features</string>
     <string name="compatibility_check_system_features_desc">Whether your device has all the required features for managing removable eUICC cards. For example, basic telephony and OMAPI support.</string>
     <string name="compatibility_check_system_features_no_telephony">Your device has no telephony features.</string>
-    <string name="compatibility_check_system_features_no_omapi">Your device has no support for accessing SIM cards via OMAPI.</string>
+    <string name="compatibility_check_system_features_no_omapi">Your device / system does not declare support for OMAPI. This could be due to missing support from hardware, or it could be simply due to a missing flag. See the following two checks to determine whether OMAPI is actually supported or not.</string>
     <string name="compatibility_check_omapi_connectivity">OMAPI Connectivity</string>
     <string name="compatibility_check_omapi_connectivity_desc">Does your device allow access to Secure Elements on SIM cards via OMAPI?</string>
-    <string name="compatibility_check_omapi_connectivity_fail">Unable to detect Secure Element readers for SIM cards via OMAPI.</string>
-    <string name="compatibility_check_omapi_connectivity_fail_sim_number">Only the following SIM slots are accessible via OMAPI: %s.</string>
+    <string name="compatibility_check_omapi_connectivity_fail">Unable to detect Secure Element readers for SIM cards via OMAPI. If you have not inserted a SIM in this device, try inserting one and retry this check.</string>
+    <string name="compatibility_check_omapi_connectivity_partial_success_sim_number">Successfully detected Secure Element access, but only for the following SIM slots: %s.</string>
     <string name="compatibility_check_isdr_channel">ISD-R Channel Access</string>
     <string name="compatibility_check_isdr_channel_desc">Does your device support opening an ISD-R (management) channel to eSIMs via OMAPI?</string>
+    <string name="compatibility_check_isdr_channel_desc_unknown">Cannot determine whether ISD-R access through OMAPI is supported. You might want to retry with SIM cards inserted (any SIM card will do) if not already.</string>
     <string name="compatibility_check_isdr_channel_desc_partial_fail">OMAPI access to ISD-R is only possible on the following SIM slots: %s.</string>
-    <string name="compatibility_check_known_broken">Known Broken?</string>
+    <string name="compatibility_check_known_broken">Not on the Known Broken List</string>
     <string name="compatibility_check_known_broken_desc">Making sure your device is not known to have bugs associated with removable eSIMs.</string>
     <string name="compatibility_check_known_broken_fail">Oops, your device is known to have bugs when accessing removable eSIMs. This does not necessarily mean that it will not work at all, but you will have to proceed with caution.</string>
+    <string name="compatibility_check_usb">USB Card Reader Support</string>
+    <string name="compatibility_check_usb_desc">Does your device support managing eSIMs via USB card readers?</string>
+    <string name="compatibility_check_usb_ok">You can manage eSIMs through standard USB CCID readers on this device (even if you had any other check items fail here). Insert the card reader and then open this app to manage eSIMs in this way.</string>
+    <string name="compatibility_check_usb_fail">Your device does not support acting as a USB host.</string>
+    <string name="compatibility_check_verdict">Verdict (non-USB)</string>
+    <string name="compatibility_check_verdict_desc">Based on all previous checks, how likely is your device to be compatible with managing inserted removable eSIMs?</string>
+    <string name="compatibility_check_verdict_ok">You can likely use and manage removable eSIMs inserted into this device.</string>
+    <string name="compatibility_check_verdict_known_broken">Your device is known to be buggy when accessing inserted removable eSIMs.\n%s</string>
+    <string name="compatibility_check_verdict_unknown_likely_ok">We cannot determine whether inserted removable eSIMs can be managed on your device. Your device does declare support for OMAPI, though, so it is slightly more likely that it will work.\n%s</string>
+    <string name="compatibility_check_verdict_unknown_likely_fail">We cannot determine whether inserted removable eSIMs can be managed on your device. Since your device does not declare support for OMAPI, it is more likely that managing removable eSIMs on this device is unsupported.\n%s</string>
+    <string name="compatibility_check_verdict_unknown">We cannot determine whether inserted removable eSIMs can be managed on your device.\n%s</string>
+    <string name="compatibility_check_verdict_fail_shared">However, a removable eSIM that has already been loaded with an eSIM profile will still work; you can also most likely use a USB card reader plugged into this device to manage profiles, even if you cannot manage one inserted into your device.</string>
 </resources>

app/src/main/java/im/angry/openeuicc/PrivilegedOpenEuiccApplication.kt

@@ -1,16 +1,17 @@
 package im.angry.openeuicc
 
-import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.core.PrivilegedEuiccChannelManager
+import im.angry.openeuicc.di.AppContainer
+import im.angry.openeuicc.di.PrivilegedAppContainer
 
 class PrivilegedOpenEuiccApplication: OpenEuiccApplication() {
-    override val euiccChannelManager: EuiccChannelManager by lazy {
-        PrivilegedEuiccChannelManager(this)
+    override val appContainer: AppContainer by lazy {
+        PrivilegedAppContainer(this)
     }
 
     override fun onCreate() {
         super.onCreate()
 
-        (euiccChannelManager as PrivilegedEuiccChannelManager).closeAllStaleChannels()
+        (appContainer.euiccChannelManager as PrivilegedEuiccChannelManager).closeAllStaleChannels()
     }
 }

app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelFactory.kt

@@ -0,0 +1,41 @@
+package im.angry.openeuicc.core
+
+import android.content.Context
+import android.util.Log
+import im.angry.openeuicc.OpenEuiccApplication
+import im.angry.openeuicc.util.*
+import java.lang.IllegalArgumentException
+
+class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFactory(context) {
+    private val tm by lazy {
+        (context.applicationContext as OpenEuiccApplication).appContainer.telephonyManager
+    }
+
+    @Suppress("NAME_SHADOWING")
+    override suspend fun tryOpenEuiccChannel(port: UiccPortInfoCompat): EuiccChannel? {
+        val port = port as RealUiccPortInfoCompat
+        if (port.card.isRemovable) {
+            // Attempt unprivileged (OMAPI) before TelephonyManager
+            // but still try TelephonyManager in case OMAPI is broken
+            super.tryOpenEuiccChannel(port)?.let { return it }
+        }
+
+        if (port.card.isEuicc) {
+            Log.i(
+                DefaultEuiccChannelManager.TAG,
+                "Trying TelephonyManager for slot ${port.card.physicalSlotIndex} port ${port.portIndex}"
+            )
+            try {
+                return EuiccChannel(port, TelephonyManagerApduInterface(port, tm))
+            } catch (e: IllegalArgumentException) {
+                // Failed
+                Log.w(
+                    DefaultEuiccChannelManager.TAG,
+                    "TelephonyManager APDU interface unavailable for slot ${port.card.physicalSlotIndex} port ${port.portIndex}, falling back"
+                )
+            }
+        }
+
+        return super.tryOpenEuiccChannel(port)
+    }
+}

app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManager.kt

@@ -1,37 +1,18 @@
 package im.angry.openeuicc.core
 
 import android.content.Context
-import android.util.Log
-import im.angry.openeuicc.OpenEuiccApplication
+import im.angry.openeuicc.di.AppContainer
 import im.angry.openeuicc.util.*
 import java.lang.Exception
-import java.lang.IllegalArgumentException
 
-class PrivilegedEuiccChannelManager(context: Context): EuiccChannelManager(context) {
+class PrivilegedEuiccChannelManager(
+    appContainer: AppContainer,
+    context: Context
+) :
+    DefaultEuiccChannelManager(appContainer, context) {
     override val uiccCards: Collection<UiccCardInfoCompat>
         get() = tm.uiccCardsInfoCompat
 
-    @Suppress("NAME_SHADOWING")
-    override fun tryOpenEuiccChannelPrivileged(port: UiccPortInfoCompat): EuiccChannel? {
-        val port = port as RealUiccPortInfoCompat
-        if (port.card.isRemovable) {
-            // Attempt unprivileged (OMAPI) before TelephonyManager
-            // but still try TelephonyManager in case OMAPI is broken
-            super.tryOpenEuiccChannelUnprivileged(port)?.let { return it }
-        }
-
-        if (port.card.isEuicc) {
-            Log.i(TAG, "Trying TelephonyManager for slot ${port.card.physicalSlotIndex} port ${port.portIndex}")
-            try {
-                return TelephonyManagerChannel(port, tm)
-            } catch (e: IllegalArgumentException) {
-                // Failed
-                Log.w(TAG, "TelephonyManager APDU interface unavailable for slot ${port.card.physicalSlotIndex} port ${port.portIndex}, falling back")
-            }
-        }
-        return null
-    }
-
     // Clean up channels left open in TelephonyManager
     // due to a (potentially) forced restart
     // This should be called every time the application is restarted
@@ -48,7 +29,7 @@ class PrivilegedEuiccChannelManager(context: Context): EuiccChannelManager(conte
     }
 
     override fun notifyEuiccProfilesChanged(logicalSlotId: Int) {
-        (context.applicationContext as OpenEuiccApplication).subscriptionManager.apply {
+        appContainer.subscriptionManager.apply {
             findEuiccChannelBySlotBlocking(logicalSlotId)?.let {
                 tryRefreshCachedEuiccInfo(it.cardId)
             }

app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManagerFactory.kt

@@ -0,0 +1,10 @@
+package im.angry.openeuicc.core
+
+import android.app.Service
+import im.angry.openeuicc.di.AppContainer
+
+class PrivilegedEuiccChannelManagerFactory(private val appContainer: AppContainer) :
+    EuiccChannelManagerFactory {
+    override fun createEuiccChannelManager(serviceContext: Service): EuiccChannelManager =
+        PrivilegedEuiccChannelManager(appContainer, serviceContext)
+}

app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt

@@ -3,10 +3,7 @@ package im.angry.openeuicc.core
 import android.telephony.IccOpenLogicalChannelResponse
 import android.telephony.TelephonyManager
 import im.angry.openeuicc.util.*
-import net.typeblog.lpac_jni.LocalProfileAssistant
 import net.typeblog.lpac_jni.ApduInterface
-import net.typeblog.lpac_jni.impl.HttpInterfaceImpl
-import net.typeblog.lpac_jni.impl.LocalProfileAssistantImpl
 
 class TelephonyManagerApduInterface(
     private val port: UiccPortInfoCompat,
@@ -14,6 +11,11 @@ class TelephonyManagerApduInterface(
 ): ApduInterface {
     private var lastChannel: Int = -1
 
+    override val valid: Boolean
+        // TelephonyManager channels will never become truly "invalid",
+        // just that transactions might return errors or nonsense
+        get() = lastChannel != -1
+
     override fun connect() {
         // Do nothing
     }
@@ -55,13 +57,3 @@ class TelephonyManagerApduInterface(
     }
 
 }
-
-class TelephonyManagerChannel(
-    port: UiccPortInfoCompat,
-    private val tm: TelephonyManager
-) : EuiccChannel(port) {
-    override val lpa: LocalProfileAssistant = LocalProfileAssistantImpl(
-        TelephonyManagerApduInterface(port, tm),
-        HttpInterfaceImpl()
-    )
-}

app/src/main/java/im/angry/openeuicc/di/PrivilegedAppContainer.kt

@@ -0,0 +1,26 @@
+package im.angry.openeuicc.di
+
+import android.content.Context
+import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.core.EuiccChannelManagerFactory
+import im.angry.openeuicc.core.PrivilegedEuiccChannelFactory
+import im.angry.openeuicc.core.PrivilegedEuiccChannelManager
+import im.angry.openeuicc.core.PrivilegedEuiccChannelManagerFactory
+
+class PrivilegedAppContainer(context: Context) : DefaultAppContainer(context) {
+    override val euiccChannelManager: EuiccChannelManager by lazy {
+        PrivilegedEuiccChannelManager(this, context)
+    }
+
+    override val euiccChannelManagerFactory: EuiccChannelManagerFactory by lazy {
+        PrivilegedEuiccChannelManagerFactory(this)
+    }
+
+    override val uiComponentFactory by lazy {
+        PrivilegedUiComponentFactory()
+    }
+
+    override val euiccChannelFactory by lazy {
+        PrivilegedEuiccChannelFactory(context)
+    }
+}

app/src/main/java/im/angry/openeuicc/di/PrivilegedUiComponentFactory.kt

@@ -0,0 +1,10 @@
+package im.angry.openeuicc.di
+
+import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.ui.EuiccManagementFragment
+import im.angry.openeuicc.ui.PrivilegedEuiccManagementFragment
+
+class PrivilegedUiComponentFactory : DefaultUiComponentFactory() {
+    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
+        PrivilegedEuiccManagementFragment.newInstance(channel.slotId, channel.portId)
+}

app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt

@@ -1,5 +1,8 @@
 package im.angry.openeuicc.service
 
+import android.content.Context
+import android.content.Intent
+import android.os.Build
 import android.service.euicc.*
 import android.telephony.UiccSlotMapping
 import android.telephony.euicc.DownloadableSubscription
@@ -7,7 +10,10 @@ import android.telephony.euicc.EuiccInfo
 import android.util.Log
 import net.typeblog.lpac_jni.LocalProfileInfo
 import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import java.lang.IllegalStateException
 
 class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
@@ -15,17 +21,68 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         const val TAG = "OpenEuiccService"
     }
 
-    private fun findChannel(physicalSlotId: Int): EuiccChannel? =
+    private val hasInternalEuicc by lazy {
+        telephonyManager.uiccCardsInfoCompat.any { it.isEuicc && !it.isRemovable }
+    }
+
+    // TODO: Should this be configurable?
+    private fun shouldIgnoreSlot(physicalSlotId: Int) =
+        if (hasInternalEuicc) {
+            // For devices with an internal eUICC slot, ignore any removable UICC
+            telephonyManager.uiccCardsInfoCompat.find { it.physicalSlotIndex == physicalSlotId }!!.isRemovable
+        } else {
+            // Otherwise, we can report at least one removable eUICC to the system without confusing
+            // it too much.
+            telephonyManager.uiccCardsInfoCompat.firstOrNull { it.isEuicc }?.physicalSlotIndex == physicalSlotId
+        }
+
+    private data class EuiccChannelManagerContext(
+        val euiccChannelManager: EuiccChannelManager
+    ) {
+        fun findChannel(physicalSlotId: Int): EuiccChannel? =
             euiccChannelManager.findEuiccChannelByPhysicalSlotBlocking(physicalSlotId)
 
-    private fun findChannel(slotId: Int, portId: Int): EuiccChannel? =
+        fun findChannel(slotId: Int, portId: Int): EuiccChannel? =
             euiccChannelManager.findEuiccChannelByPortBlocking(slotId, portId)
 
-    private fun findAllChannels(physicalSlotId: Int): List<EuiccChannel>? =
+        fun findAllChannels(physicalSlotId: Int): List<EuiccChannel>? =
             euiccChannelManager.findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId)
+    }
 
-    override fun onGetEid(slotId: Int): String? =
+    /**
+     * Bind to EuiccChannelManagerService, run the callback with a EuiccChannelManager instance,
+     * and then unbind after the callback is finished. All methods in this class that require access
+     * to a EuiccChannelManager should be wrapped inside this call.
+     *
+     * This ensures that we only spawn and connect to APDU channels when we absolutely need to,
+     * instead of keeping them open unnecessarily in the background at all times.
+     *
+     * This function cannot be inline because non-local returns may bypass the unbind
+     */
+    private fun <T> withEuiccChannelManager(fn: EuiccChannelManagerContext.() -> T): T {
+        val (binder, unbind) = runBlocking {
+            bindServiceSuspended(
+                Intent(
+                    this@OpenEuiccService,
+                    EuiccChannelManagerService::class.java
+                ), Context.BIND_AUTO_CREATE
+            )
+        }
+
+        if (binder == null) {
+            throw RuntimeException("Unable to bind to EuiccChannelManagerService; aborting")
+        }
+
+        val ret =
+            EuiccChannelManagerContext((binder as EuiccChannelManagerService.LocalBinder).service.euiccChannelManager).fn()
+
+        unbind()
+        return ret
+    }
+
+    override fun onGetEid(slotId: Int): String? = withEuiccChannelManager {
         findChannel(slotId)?.lpa?.eID
+    }
 
     // When two eSIM cards are present on one device, the Android settings UI
     // gets confused and sets the incorrect slotId for profiles from one of
@@ -34,6 +91,10 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         lpa.profiles.any { it.iccid == iccid }
 
     private fun ensurePortIsMapped(slotId: Int, portId: Int) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            return
+        }
+
         val mappings = telephonyManager.simSlotMapping.toMutableList()
 
         mappings.firstOrNull { it.physicalSlotIndex == slotId && it.portIndex == portId }?.let {
@@ -104,9 +165,24 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         return GetDefaultDownloadableSubscriptionListResult(RESULT_OK, arrayOf())
     }
 
-    override fun onGetEuiccProfileInfoList(slotId: Int): GetEuiccProfileInfoListResult? {
+    override fun onGetEuiccProfileInfoList(slotId: Int): GetEuiccProfileInfoListResult = withEuiccChannelManager {
         Log.i(TAG, "onGetEuiccProfileInfoList slotId=$slotId")
-        val channel = findChannel(slotId) ?: return null
+        if (slotId == -1 || shouldIgnoreSlot(slotId)) {
+            Log.i(TAG, "ignoring slot $slotId")
+            return@withEuiccChannelManager GetEuiccProfileInfoListResult(
+                RESULT_FIRST_USER,
+                arrayOf(),
+                true
+            )
+        }
+
+        // TODO: Temporarily enable the slot to access its profiles if it is currently unmapped
+        val channel =
+            findChannel(slotId) ?: return@withEuiccChannelManager GetEuiccProfileInfoListResult(
+                RESULT_FIRST_USER,
+                arrayOf(),
+                true
+            )
         val profiles = channel.lpa.profiles.operational.map {
             EuiccProfileInfo.Builder(it.iccid).apply {
                 setProfileName(it.name)
@@ -128,41 +204,54 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
             }.build()
         }
 
-        return GetEuiccProfileInfoListResult(RESULT_OK, profiles.toTypedArray(), channel.removable)
+        return@withEuiccChannelManager GetEuiccProfileInfoListResult(
+            RESULT_OK,
+            profiles.toTypedArray(),
+            channel.removable
+        )
     }
 
     override fun onGetEuiccInfo(slotId: Int): EuiccInfo {
         return EuiccInfo("Unknown") // TODO: Can we actually implement this?
     }
 
-    override fun onDeleteSubscription(slotId: Int, iccid: String): Int {
+    override fun onDeleteSubscription(slotId: Int, iccid: String): Int = withEuiccChannelManager {
         Log.i(TAG, "onDeleteSubscription slotId=$slotId iccid=$iccid")
+        if (shouldIgnoreSlot(slotId)) return@withEuiccChannelManager RESULT_FIRST_USER
+
         try {
-            val channels = findAllChannels(slotId) ?: return RESULT_FIRST_USER
+            val channels =
+                findAllChannels(slotId) ?: return@withEuiccChannelManager RESULT_FIRST_USER
 
             if (!channels[0].profileExists(iccid)) {
-                return RESULT_FIRST_USER
+                return@withEuiccChannelManager RESULT_FIRST_USER
             }
 
             // If the profile is enabled by ANY channel (port), we cannot delete it
             channels.forEach { channel ->
                 val profile = channel.lpa.profiles.find {
                     it.iccid == iccid
-                } ?: return RESULT_FIRST_USER
+                } ?: return@withEuiccChannelManager RESULT_FIRST_USER
 
                 if (profile.state == LocalProfileInfo.State.Enabled) {
                     // Must disable the profile first
-                    return RESULT_FIRST_USER
+                    return@withEuiccChannelManager RESULT_FIRST_USER
                 }
             }
 
-            return if (channels[0].lpa.deleteProfile(iccid)) {
-                RESULT_OK
-            } else {
-                RESULT_FIRST_USER
+            euiccChannelManager.beginTrackedOperationBlocking(channels[0].slotId, channels[0].portId) {
+                if (channels[0].lpa.deleteProfile(iccid)) {
+                    return@withEuiccChannelManager RESULT_OK
                 }
+
+                runBlocking {
+                    preferenceRepository.notificationDeleteFlow.first()
+                }
+            }
+
+            return@withEuiccChannelManager RESULT_FIRST_USER
         } catch (e: Exception) {
-            return RESULT_FIRST_USER
+            return@withEuiccChannelManager RESULT_FIRST_USER
         }
     }
 
@@ -180,8 +269,10 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
         portIndex: Int,
         iccid: String?,
         forceDeactivateSim: Boolean
-    ): Int {
+    ): Int = withEuiccChannelManager {
         Log.i(TAG,"onSwitchToSubscriptionWithPort slotId=$slotId portIndex=$portIndex iccid=$iccid forceDeactivateSim=$forceDeactivateSim")
+        if (shouldIgnoreSlot(slotId)) return@withEuiccChannelManager RESULT_FIRST_USER
+
         try {
             // retryWithTimeout is needed here because this function may be called just after
             // AOSP has switched slot mappings, in which case the slots may not be ready yet.
@@ -192,7 +283,7 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
             } ?: run {
                 if (!forceDeactivateSim) {
                     // The user must select which SIM to deactivate
-                    return@onSwitchToSubscriptionWithPort RESULT_MUST_DEACTIVATE_SIM
+                    return@withEuiccChannelManager RESULT_MUST_DEACTIVATE_SIM
                 } else {
                     try {
                         // If we are allowed to deactivate any SIM we like, try mapping the indicated port first
@@ -202,44 +293,56 @@ class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
                         // We cannot map the port (or it is already mapped)
                         // but we can also use any port available on the card
                         retryWithTimeout(5000) { findChannel(slotId) }
-                    } ?: return@onSwitchToSubscriptionWithPort RESULT_FIRST_USER
+                    } ?: return@withEuiccChannelManager RESULT_FIRST_USER
                 }
             }
 
             if (iccid != null && !channel.profileExists(iccid)) {
                 Log.i(TAG, "onSwitchToSubscriptionWithPort iccid=$iccid not found")
-                return RESULT_FIRST_USER
+                return@withEuiccChannelManager RESULT_FIRST_USER
             }
 
-            // Disable any active profile first if present
-            channel.lpa.profiles.find {
-                it.state == LocalProfileInfo.State.Enabled
-            }?.let { if (!channel.lpa.disableProfile(it.iccid)) return RESULT_FIRST_USER }
-
+            euiccChannelManager.beginTrackedOperationBlocking(channel.slotId, channel.portId) {
                 if (iccid != null) {
+                    // Disable any active profile first if present
+                    channel.lpa.disableActiveProfile(false)
                     if (!channel.lpa.enableProfile(iccid)) {
-                    return RESULT_FIRST_USER
+                        return@withEuiccChannelManager RESULT_FIRST_USER
+                    }
+                } else {
+                    if (!channel.lpa.disableActiveProfile(true)) {
+                        return@withEuiccChannelManager RESULT_FIRST_USER
                     }
                 }
 
-            return RESULT_OK
+                runBlocking {
+                    preferenceRepository.notificationSwitchFlow.first()
+                }
+            }
+
+            return@withEuiccChannelManager RESULT_OK
         } catch (e: Exception) {
-            return RESULT_FIRST_USER
+            return@withEuiccChannelManager RESULT_FIRST_USER
         } finally {
             euiccChannelManager.invalidate()
         }
     }
 
-    override fun onUpdateSubscriptionNickname(slotId: Int, iccid: String, nickname: String?): Int {
-        Log.i(TAG, "onUpdateSubscriptionNickname slotId=$slotId iccid=$iccid nickname=$nickname")
-        val channel = findChannel(slotId) ?: return RESULT_FIRST_USER
+    override fun onUpdateSubscriptionNickname(slotId: Int, iccid: String, nickname: String?): Int =
+        withEuiccChannelManager {
+            Log.i(
+                TAG,
+                "onUpdateSubscriptionNickname slotId=$slotId iccid=$iccid nickname=$nickname"
+            )
+            if (shouldIgnoreSlot(slotId)) return@withEuiccChannelManager RESULT_FIRST_USER
+            val channel = findChannel(slotId) ?: return@withEuiccChannelManager RESULT_FIRST_USER
             if (!channel.profileExists(iccid)) {
-            return RESULT_FIRST_USER
+                return@withEuiccChannelManager RESULT_FIRST_USER
             }
             val success = channel.lpa
                 .setNickname(iccid, nickname!!)
-        openEuiccApplication.subscriptionManager.tryRefreshCachedEuiccInfo(channel.cardId)
-        return if (success) {
+            appContainer.subscriptionManager.tryRefreshCachedEuiccInfo(channel.cardId)
+            return@withEuiccChannelManager if (success) {
                 RESULT_OK
             } else {
                 RESULT_FIRST_USER

app/src/main/java/im/angry/openeuicc/ui/LuiActivity.kt

@@ -10,10 +10,10 @@ class LuiActivity : AppCompatActivity() {
         super.onStart()
         setContentView(R.layout.activity_lui)
 
-        findViewById<View>(R.id.lui_skip).setOnClickListener { finish() }
+        requireViewById<View>(R.id.lui_skip).setOnClickListener { finish() }
         // TODO: Deactivate LuiActivity if there is no eSIM found.
         // TODO: Support pre-filled download info (from carrier apps); UX
-        findViewById<View>(R.id.lui_download).setOnClickListener {
+        requireViewById<View>(R.id.lui_download).setOnClickListener {
             startActivity(Intent(this, DirectProfileDownloadActivity::class.java))
         }
     }

app/src/main/java/im/angry/openeuicc/ui/PrivilegedEuiccManagementFragment.kt

@@ -6,6 +6,8 @@ import android.widget.Button
 import android.widget.PopupMenu
 import im.angry.openeuicc.R
 import im.angry.openeuicc.util.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.LocalProfileInfo
 
 class PrivilegedEuiccManagementFragment: EuiccManagementFragment() {
@@ -14,15 +16,22 @@ class PrivilegedEuiccManagementFragment: EuiccManagementFragment() {
             newInstanceEuicc(PrivilegedEuiccManagementFragment::class.java, slotId, portId)
     }
 
-    override suspend fun onCreateFooterViews(parent: ViewGroup): List<View> =
-        if (channel.isMEP) {
+    override suspend fun onCreateFooterViews(
+        parent: ViewGroup,
+        profiles: List<LocalProfileInfo>
+    ): List<View> =
+        super.onCreateFooterViews(parent, profiles).let { footers ->
+            // isMEP can map to a slow operation (UiccCardInfo.isMultipleEnabledProfilesSupported())
+            // so let's do it in the IO context
+            if (withContext(Dispatchers.IO) { channel.isMEP }) {
                 val view = layoutInflater.inflate(R.layout.footer_mep, parent, false)
-            view.findViewById<Button>(R.id.footer_mep_slot_mapping).setOnClickListener {
+                view.requireViewById<Button>(R.id.footer_mep_slot_mapping).setOnClickListener {
                     (requireActivity() as PrivilegedMainActivity).showSlotMappingFragment()
                 }
-            listOf(view)
+                footers + view
             } else {
-            listOf()
+                footers
+            }
         }
 
     override fun populatePopupWithProfileActions(popup: PopupMenu, profile: LocalProfileInfo) {

app/src/main/java/im/angry/openeuicc/ui/PrivilegedMainActivity.kt

@@ -1,10 +1,10 @@
 package im.angry.openeuicc.ui
 
+import android.os.Build
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
 import im.angry.openeuicc.R
-import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.util.*
 
 class PrivilegedMainActivity : MainActivity() {
@@ -12,6 +12,10 @@ class PrivilegedMainActivity : MainActivity() {
         super.onCreateOptionsMenu(menu)
         menuInflater.inflate(R.menu.activity_main_privileged, menu)
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            menu.findItem(R.id.slot_mapping).isVisible = false
+        }
+
         if (tm.supportsDSDS) {
             val dsds = menu.findItem(R.id.dsds)
             dsds.isVisible = true
@@ -26,7 +30,7 @@ class PrivilegedMainActivity : MainActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
         R.id.dsds -> {
-            tm.setDsdsEnabled(openEuiccApplication.euiccChannelManager, !item.isChecked)
+            tm.setDsdsEnabled(euiccChannelManager, !item.isChecked)
             Toast.makeText(this, R.string.toast_dsds_switched, Toast.LENGTH_LONG).show()
             finish()
             true
@@ -37,7 +41,4 @@ class PrivilegedMainActivity : MainActivity() {
         }
         else -> super.onOptionsItemSelected(item)
     }
-
-    override fun createEuiccManagementFragment(channel: EuiccChannel): EuiccManagementFragment =
-        PrivilegedEuiccManagementFragment.newInstance(channel.slotId, channel.portId)
 }

app/src/main/java/im/angry/openeuicc/ui/SlotMappingFragment.kt

@@ -32,12 +32,8 @@ class SlotMappingFragment: BaseMaterialDialogFragment(),
         const val TAG = "SlotMappingFragment"
     }
 
-    private val tm: TelephonyManager by lazy {
-        (requireContext().applicationContext as OpenEuiccApplication).telephonyManager
-    }
-
     private val ports: List<UiccPortInfoCompat> by lazy {
-        tm.uiccCardsInfoCompat.flatMap { it.ports }
+        telephonyManager.uiccCardsInfoCompat.flatMap { it.ports }
     }
 
     private val portsDesc: List<String> by lazy {
@@ -55,12 +51,12 @@ class SlotMappingFragment: BaseMaterialDialogFragment(),
         savedInstanceState: Bundle?
     ): View? {
         val view = inflater.inflate(R.layout.fragment_slot_mapping, container, false)
-        toolbar = view.findViewById(R.id.toolbar)
+        toolbar = view.requireViewById(R.id.toolbar)
         toolbar.inflateMenu(R.menu.fragment_slot_mapping)
-        recyclerView = view.findViewById(R.id.mapping_list)
+        recyclerView = view.requireViewById(R.id.mapping_list)
         recyclerView.layoutManager =
             LinearLayoutManager(view.context, LinearLayoutManager.VERTICAL, false)
-        helpTextView = view.findViewById(R.id.mapping_help)
+        helpTextView = view.requireViewById(R.id.mapping_help)
         return view
     }
 
@@ -81,7 +77,7 @@ class SlotMappingFragment: BaseMaterialDialogFragment(),
     private fun init() {
         lifecycleScope.launch(Dispatchers.Main) {
             val mapping = withContext(Dispatchers.IO) {
-                tm.simSlotMapping
+                telephonyManager.simSlotMapping
             }
 
             adapter = SlotMappingAdapter(mapping.toMutableList().apply {
@@ -100,14 +96,17 @@ class SlotMappingFragment: BaseMaterialDialogFragment(),
                 withContext(Dispatchers.IO) {
                     // Use the utility method from PrivilegedTelephonyUtils to ensure
                     // unmapped ports have all profiles disabled
-                    tm.updateSimSlotMapping(openEuiccApplication.euiccChannelManager, adapter.mappings)
+                    telephonyManager.updateSimSlotMapping(
+                        (requireActivity() as BaseEuiccAccessActivity).euiccChannelManager,
+                        adapter.mappings
+                    )
                 }
             } catch (e: Exception) {
                 Toast.makeText(requireContext(), R.string.slot_mapping_failure, Toast.LENGTH_LONG).show()
                 return@launch
             }
             Toast.makeText(requireContext(), R.string.slot_mapping_completed, Toast.LENGTH_LONG).show()
-            openEuiccApplication.euiccChannelManager.invalidate()
+            (requireActivity() as BaseEuiccAccessActivity).euiccChannelManager.invalidate()
             requireActivity().finish()
         }
     }
@@ -115,7 +114,7 @@ class SlotMappingFragment: BaseMaterialDialogFragment(),
     private suspend fun buildHelpText() = withContext(Dispatchers.IO) {
         val nLogicalSlots = adapter.mappings.size
 
-        val cards = openEuiccApplication.telephonyManager.uiccCardsInfoCompat
+        val cards = telephonyManager.uiccCardsInfoCompat
 
         val nPhysicalSlots = cards.size
         var idxMepCard = -1
@@ -129,7 +128,7 @@ class SlotMappingFragment: BaseMaterialDialogFragment(),
         }
 
         val mayEnableDSDS =
-            openEuiccApplication.telephonyManager.supportsDSDS && !openEuiccApplication.telephonyManager.dsdsEnabled
+            telephonyManager.supportsDSDS && !telephonyManager.dsdsEnabled
         val extraText =
             if (nLogicalSlots == 1 && mayEnableDSDS) {
                 getString(R.string.slot_mapping_help_dsds)
@@ -152,8 +151,8 @@ class SlotMappingFragment: BaseMaterialDialogFragment(),
         }
 
     inner class ViewHolder(root: View): RecyclerView.ViewHolder(root), OnItemSelectedListener {
-        private val textViewLogicalSlot: TextView = root.findViewById(R.id.slot_mapping_logical_slot)
-        private val spinnerPorts: Spinner = root.findViewById(R.id.slot_mapping_ports)
+        private val textViewLogicalSlot: TextView = root.requireViewById(R.id.slot_mapping_logical_slot)
+        private val spinnerPorts: Spinner = root.requireViewById(R.id.slot_mapping_ports)
 
         init {
             spinnerPorts.adapter = ArrayAdapter(requireContext(), im.angry.openeuicc.common.R.layout.spinner_item, portsDesc)

app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyCompat.kt

@@ -95,9 +95,9 @@ fun TelephonyManager.iccOpenLogicalChannelByPortCompat(
     slotIndex: Int, portIndex: Int, aid: String?, p2: Int
 ): IccOpenLogicalChannelResponse =
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        iccOpenLogicalChannelByPort(slotIndex, portIndex, aid, p2)
+        iccOpenLogicalChannelByPort(slotIndex, portIndex, aid, p2)!!
     } else {
-        iccOpenLogicalChannelBySlot(slotIndex, aid, p2)
+        iccOpenLogicalChannelBySlot(slotIndex, aid, p2)!!
     }
 
 fun TelephonyManager.iccCloseLogicalChannelByPortCompat(

app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyUtils.kt

@@ -15,14 +15,14 @@ val TelephonyManager.dsdsEnabled: Boolean
     get() = activeModemCount >= 2
 
 fun TelephonyManager.setDsdsEnabled(euiccManager: EuiccChannelManager, enabled: Boolean) {
-    runBlocking {
+    val knownChannels = runBlocking {
         euiccManager.enumerateEuiccChannels()
     }
 
     // Disable all eSIM profiles before performing a DSDS switch (only for internal eSIMs)
-    euiccManager.knownChannels.forEach {
+    knownChannels.forEach {
         if (!it.removable) {
-            it.lpa.disableActiveProfileWithUndo()
+            it.lpa.disableActiveProfileWithUndo(false)
         }
     }
 
@@ -45,7 +45,7 @@ fun TelephonyManager.updateSimSlotMapping(
     val undo = unmapped.mapNotNull { mapping ->
         euiccManager.findEuiccChannelByPortBlocking(mapping.physicalSlotIndex, mapping.portIndex)?.let { channel ->
             if (!channel.removable) {
-                return@mapNotNull channel.lpa.disableActiveProfileWithUndo()
+                return@mapNotNull channel.lpa.disableActiveProfileWithUndo(false)
             } else {
                 // Do not do anything for external eUICCs -- we can't really trust them to work properly
                 // with no profile enabled.
@@ -74,11 +74,12 @@ fun SubscriptionManager.tryRefreshCachedEuiccInfo(cardId: Int) {
 }
 
 // Every EuiccChannel we use here should be backed by a RealUiccPortInfoCompat
+// except when it is from a USB card reader
 val EuiccChannel.removable
-    get() = (port as RealUiccPortInfoCompat).card.isRemovable
+    get() = (port as? RealUiccPortInfoCompat)?.card?.isRemovable ?: true
 
 val EuiccChannel.cardId
-    get() = (port as RealUiccPortInfoCompat).card.cardId
+    get() = (port as? RealUiccPortInfoCompat)?.card?.cardId ?: -1
 
 val EuiccChannel.isMEP
-    get() = (port as RealUiccPortInfoCompat).card.isMultipleEnabledProfilesSupported
+    get() = (port as? RealUiccPortInfoCompat)?.card?.isMultipleEnabledProfilesSupported ?: false

app/src/main/java/im/angry/openeuicc/util/PrivilegedUtils.kt

@@ -0,0 +1,27 @@
+package im.angry.openeuicc.util
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import java.util.concurrent.Executors
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+suspend fun Context.bindServiceSuspended(intent: Intent, flags: Int): Pair<IBinder?, () -> Unit> =
+    suspendCoroutine { cont ->
+        var binder: IBinder?
+        val conn = object : ServiceConnection {
+            override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+                binder = service
+                cont.resume(Pair(binder) { unbindService(this) })
+            }
+
+            override fun onServiceDisconnected(name: ComponentName?) {
+
+            }
+        }
+
+        bindService(intent, flags, Executors.newSingleThreadExecutor(), conn)
+    }

app/src/main/res/layout/footer_mep.xml

@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="40dp"
         android:layout_marginEnd="40dp"
+        android:layout_marginTop="6dp"
         android:gravity="center"
         android:text="@string/footer_mep"
         android:textStyle="italic"

buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt

@@ -12,7 +12,7 @@ val Project.gitVersionCode: Int
         try {
             val stdout = ByteArrayOutputStream()
             exec {
-                commandLine("git", "rev-list", "--first-parent", "--count", "master")
+                commandLine("git", "rev-list", "--first-parent", "--count", "HEAD")
                 standardOutput = stdout
             }
             stdout.toString("utf-8").trim('\n').toInt()

libs/lpac-jni/LICENSE

@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+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
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser 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 Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

libs/lpac-jni/build.gradle.kts

@@ -15,12 +15,11 @@ android {
 
         externalNativeBuild {
             ndkBuild {
-                if (System.getenv("REPRODUCIBLE_BUILD") != "true") {
-                    arguments("-j4")
-                } else {
-                    arguments("-j1")
-                    cFlags("-fmacro-prefix-map=${project.projectDir.toString()}=/fake/path/")
-                }
+                cFlags(
+                    "-fmacro-prefix-map=${project.projectDir.toString()}=/fake/path/",
+                    "-fdebug-prefix-map=${project.projectDir.toString()}=/fake/path/",
+                    "-ffile-prefix-map=${project.projectDir.toString()}=/fake/path/"
+                )
             }
         }
     }

libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/ApduInterface.kt

@@ -9,4 +9,11 @@ interface ApduInterface {
     fun logicalChannelOpen(aid: ByteArray): Int
     fun logicalChannelClose(handle: Int)
     fun transmit(tx: ByteArray): ByteArray
+
+    /**
+     * Is this APDU connection still valid?
+     * Note that even if this returns true, the underlying connection might be broken anyway;
+     * callers should further check with the LPA to fully determine the validity of a channel
+     */
+    val valid: Boolean
 }

libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/EuiccInfo2.kt

@@ -3,12 +3,12 @@ package net.typeblog.lpac_jni
 /* Corresponds to EuiccInfo2 in SGP.22 */
 data class EuiccInfo2(
     val profileVersion: String,
-    val sgp22Version: String,
     val euiccFirmwareVersion: String,
-    val uiccFirmwareVersion: String,
     val globalPlatformVersion: String,
     val sasAccreditationNumber: String,
     val ppVersion: String,
     val freeNvram: Int,
     val freeRam: Int,
+    val euiccCiPKIdListForSigning: Array<String>,
+    val euiccCiPKIdListForVerification: Array<String>,
 )

libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/HttpInterface.kt

@@ -1,5 +1,7 @@
 package net.typeblog.lpac_jni
 
+import javax.net.ssl.TrustManager
+
 /*
  * Should reflect euicc_http_interface in lpac/euicc/interface.h
  */
@@ -25,4 +27,8 @@ interface HttpInterface {
     }
 
     fun transmit(url: String, tx: ByteArray, headers: Array<String>): HttpResponse
+    // The LPA is supposed to pass in a list of pkIds supported by the eUICC.
+    // HttpInterface is responsible for providing TrustManager implementations that
+    // validate based on certificates corresponding to these pkIds
+    fun usePublicKeyIds(pkids: Array<String>)
 }

libs/lpac-jni/src/main/java/net/typeblog/lpac_jni/LocalProfileAssistant.kt

@@ -1,24 +1,7 @@
 package net.typeblog.lpac_jni
 
-import android.util.Log
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
 interface LocalProfileAssistant {
-    companion object {
-        private const val TAG = "LocalProfileAssistant"
-    }
-
     val valid: Boolean
-        get() = try {
-            // If we can read both eID and profiles properly, we are likely looking at
-            // a valid LocalProfileAssistant
-            eID
-            profiles
-            true
-        } catch (e: Exception) {
-            false
-        }
     val profiles: List<LocalProfileInfo>
     val notifications: List<LocalProfileNotification>
     val eID: String
@@ -27,8 +10,8 @@ interface LocalProfileAssistant {
 
     // All blocking functions in this class assume that they are executed on non-Main threads
     // The IO context in Kotlin's coroutine library is recommended.
-    fun enableProfile(iccid: String, reconnectTimeout: Long = 0): Boolean
-    fun disableProfile(iccid: String, reconnectTimeout: Long = 0): Boolean
+    fun enableProfile(iccid: String, refresh: Boolean = true): Boolean
+    fun disableProfile(iccid: String, refresh: Boolean = true): Boolean
     fun deleteProfile(iccid: String): Boolean
 
     fun downloadProfile(smdp: String, matchingId: String?, imei: String?,
@@ -37,24 +20,6 @@ interface LocalProfileAssistant {
     fun deleteNotification(seqNumber: Long): Boolean
     fun handleNotification(seqNumber: Long): Boolean
 
-    // Wraps an operation on the eSIM chip (any of the other blocking functions)
-    // Handles notifications automatically after the operation, unless the lambda executing
-    // the operation returns false, which inhibits automatic notification processing.
-    // All code executed within are also wrapped automatically in the IO context.
-    suspend fun beginOperation(op: suspend LocalProfileAssistant.() -> Boolean) =
-        withContext(Dispatchers.IO) {
-            val latestSeq = notifications.firstOrNull()?.seqNumber ?: 0
-            Log.d(TAG, "Latest notification is $latestSeq before operation")
-            if (op(this@LocalProfileAssistant)) {
-                Log.d(TAG, "Operation has requested notification handling")
-                notifications.filter { it.seqNumber > latestSeq }.forEach {
-                    Log.d(TAG, "Handling notification $it")
-                    handleNotification(it.seqNumber)
-                }
-            }
-            Log.d(TAG, "Operation complete")
-        }
-
     fun setNickname(
         iccid: String, nickname: String
     ): Boolean