Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 273c23ee authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Change some DAVdroid leftovers to DAVx⁵; remove Lombok config (thanks @mbiebl)

parent a34b3b1f

app/proguard-rules.txt

+4 −4
Original line number Original line Diff line number Diff line 




# ProGuard usage for DAVdroid:

# ProGuard usage for DAVx⁵:

#       shrinking        yes (main reason for using ProGuard)

#       shrinking        yes (main reason for using ProGuard)

#       optimization     yes

#       optimization     yes

#       obfuscation      no (DAVdroid is open-source)

#       obfuscation      no (DAVx⁵ is open-source)

#       preverification  no

#       preverification  no





-dontobfuscate

-dontobfuscate
@@ -43,5 +43,5 @@ 
# dnsjava

# dnsjava

-dontwarn sun.net.spi.nameservice.**   # not available on Android

-dontwarn sun.net.spi.nameservice.**   # not available on Android





# DAVdroid + libs

# DAVx⁵ + libs

-keep class at.bitfire.** { *; }       # all DAVdroid code is required
 
-keep class at.bitfire.** { *; }       # all DAVx⁵ code is required

app/src/main/AndroidManifest.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ 
                android:resource="@xml/debug_paths" />

                android:resource="@xml/debug_paths" />

        </provider>

        </provider>





        <!-- account type "DAVdroid" -->

        <!-- account type "DAVx⁵" -->

        <service

        <service

            android:name=".syncadapter.AccountAuthenticatorService"

            android:name=".syncadapter.AccountAuthenticatorService"

            android:exported="false">

            android:exported="false">
@@ -138,7 +138,7 @@ 
                android:resource="@xml/sync_tasks"/>

                android:resource="@xml/sync_tasks"/>

        </service>

        </service>





        <!-- account type "DAVdroid Address book" -->

        <!-- account type "DAVx⁵ Address book" -->

        <service

        <service

            android:name=".syncadapter.NullAuthenticatorService"

            android:name=".syncadapter.NullAuthenticatorService"

            android:exported="false">

            android:exported="false">

app/src/main/lombok.config

deleted100644 → 0
+0 −2
Original line number Original line Diff line number Diff line 
lombok.addGeneratedAnnotation = false

lombok.anyConstructor.suppressConstructorProperties = true

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:textAlignment="center"

            android:textAlignment="center"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:text="DAVdroid"

            android:text="DAVx⁵"

            tools:ignore="HardcodedText" />

            tools:ignore="HardcodedText" />





        <TextView

        <TextView

dav4jvm @ 4f7fc76a

Compare 324c4cf6 to 4f7fc76a
Original line number Original line Diff line number Diff line 
Subproject commit 324c4cf62d612c553c6a01744898be3819cdfb2d
 
Subproject commit 4f7fc76a0e80b743a727220d2866ca7390c4f5a5