Fix lint issues (ee8ef134) · Commits · e / os / AccountManager

app-ose/src/ose/AndroidManifest.xml

+11 −15

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaCalendarsSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaCalendarsSyncAdapterService"
		android:exported="true"
		tools:ignore="ExportedService">
		<intent-filter>
		@@ -98,7 +98,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaJtxSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaJtxSyncAdapterService"
		android:exported="true"
		tools:ignore="ExportedService">
		<intent-filter>
		@@ -110,7 +110,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaOpenTasksSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaOpenTasksSyncAdapterService"
		android:exported="true"
		tools:ignore="ExportedService">
		<intent-filter>
		@@ -122,7 +122,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaEOpenTasksSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaEOpenTasksSyncAdapterService"
		android:exported="true"
		tools:ignore="ExportedService">
		<intent-filter>
		@@ -134,7 +134,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaTasksOrgSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaTasksOrgSyncAdapterService"
		android:exported="true"
		tools:ignore="ExportedService">
		<intent-filter>
		@@ -170,7 +170,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaContactsSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaContactsSyncAdapterService"
		android:exported="true"
		tools:ignore="ExportedService">
		<intent-filter>
		@@ -186,7 +186,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaMeteredEdriveSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaMeteredEdriveSyncAdapterService"
		android:exported="true"
		android:process=":sync"
		tools:ignore="ExportedService">
		@@ -200,7 +200,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaMediaSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaMediaSyncAdapterService"
		android:exported="true"
		android:process=":sync"
		tools:ignore="ExportedService">
		@@ -214,7 +214,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaAppDataSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaAppDataSyncAdapterService"
		android:exported="true"
		android:process=":sync"
		tools:ignore="ExportedService">
		@@ -228,7 +228,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaEmailSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaEmailSyncAdapterService"
		android:exported="true"
		android:process=":sync"
		tools:ignore="ExportedService">
		@@ -242,7 +242,7 @@
		</service>

		<service
		android:name=".sync.adapter.MurenaNotesSyncAdapterService"
		android:name="at.bitfire.davdroid.sync.adapter.MurenaNotesSyncAdapterService"
		android:exported="true"
		android:process=":sync"
		tools:ignore="ExportedService">
		@@ -281,10 +281,6 @@
		<receiver
		android:name="foundation.e.accountmanager.sync.SyncBroadcastReceiver" />

		<activity
		android:name="com.owncloud.android.ui.activity.SsoGrantPermissionActivity"
		android:exported="true" />

		<service
		android:name="com.owncloud.android.services.AccountManagerService"
		android:enabled="true"

core/src/main/AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,10 @@
		android:resource="@xml/widget_info_icon_sync_button" />
		</receiver>

		<activity
		android:name="com.owncloud.android.ui.activity.SsoGrantPermissionActivity"
		android:exported="true" />

		</application>

		<!-- package visiblity – which apps do we need to see? -->

core/src/main/kotlin/foundation/e/accountmanager/ui/setup/ReOAuthActivity.kt

+3 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import at.bitfire.davdroid.ui.account.AccountSettingsModel
		import at.bitfire.davdroid.ui.composable.AppTheme
		import dagger.hilt.android.AndroidEntryPoint
		import foundation.e.accountmanager.utils.AccountHelper
		import androidx.compose.ui.res.stringResource

		@AndroidEntryPoint
		class ReOAuthActivity : ComponentActivity() {
		@@ -76,6 +77,7 @@ fun OAuthHandlerScreen(
		val model = hiltViewModel { factory: AccountSettingsModel.Factory ->
		factory.create(account)
		}
		val responseText = stringResource(R.string.account_updated_toast)

		val authRequestContract = rememberLauncherForActivityResult(model.authorizationContract()) { authResponse ->
		if (authResponse != null) {
		@@ -93,7 +95,7 @@ fun OAuthHandlerScreen(

		Toast.makeText(
		context,
		context.getString(R.string.account_updated_toast),
		responseText,
		Toast.LENGTH_SHORT
		).show()
		} else {