rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Format project (only modified files, there are other fomatting issues).

Browse Source
This commit is contained in:
Benoit Marty 2022-06-09 10:38:38 +02:00
parent c43122a6f8
commit 2f2ee1b894
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/fdroid/AndroidManifest.xml
View File

@ -28,7 +28,8 @@
android:enabled="true" android:enabled="true"
android:exported="false" /> android:exported="false" />
<receiver android:name=".fdroid.receiver.KeepInternalDistributor" <receiver
android:name=".fdroid.receiver.KeepInternalDistributor"
android:enabled="true" android:enabled="true"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
@ -48,4 +49,4 @@
</application> </application>
</manifest> </manifest>

4
vector/src/gplay/AndroidManifest.xml
View File

@ -15,8 +15,8 @@
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
<action android:name="org.unifiedpush.android.distributor.REGISTER"/> <action android:name="org.unifiedpush.android.distributor.REGISTER" />
<action android:name="org.unifiedpush.android.distributor.UNREGISTER"/> <action android:name="org.unifiedpush.android.distributor.UNREGISTER" />
</intent-filter> </intent-filter>
</receiver> </receiver>

18
vector/src/main/AndroidManifest.xml
View File

@ -304,7 +304,8 @@
android:supportsPictureInPicture="true" /> android:supportsPictureInPicture="true" />
<activity android:name=".features.terms.ReviewTermsActivity" /> <activity android:name=".features.terms.ReviewTermsActivity" />
<activity android:name=".features.widgets.WidgetActivity" <activity
android:name=".features.widgets.WidgetActivity"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" /> android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" />
<activity android:name=".features.pin.PinActivity" /> <activity android:name=".features.pin.PinActivity" />
@ -411,13 +412,16 @@
</receiver> </receiver>
<!-- UnifiedPush --> <!-- UnifiedPush -->
<receiver android:exported="true" android:enabled="true" android:name=".core.pushers.VectorMessagingReceiver"> <receiver
android:exported="true"
android:enabled="true"
android:name=".core.pushers.VectorMessagingReceiver">
<intent-filter> <intent-filter>
<action android:name="org.unifiedpush.android.connector.MESSAGE"/> <action android:name="org.unifiedpush.android.connector.MESSAGE" />
<action android:name="org.unifiedpush.android.connector.UNREGISTERED"/> <action android:name="org.unifiedpush.android.connector.UNREGISTERED" />
<action android:name="org.unifiedpush.android.connector.NEW_ENDPOINT"/> <action android:name="org.unifiedpush.android.connector.NEW_ENDPOINT" />
<action android:name="org.unifiedpush.android.connector.REGISTRATION_FAILED"/> <action android:name="org.unifiedpush.android.connector.REGISTRATION_FAILED" />
<action android:name="org.unifiedpush.android.connector.REGISTRATION_REFUSED"/> <action android:name="org.unifiedpush.android.connector.REGISTRATION_REFUSED" />
</intent-filter> </intent-filter>
</receiver> </receiver>

4
vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
View File

@ -239,8 +239,8 @@ class UnifiedPushHelper @Inject constructor(
fun getCurrentDistributorName(): String { fun getCurrentDistributorName(): String {
return when { return when {
isEmbeddedDistributor() -> stringProvider.getString(R.string.unifiedpush_distributor_fcm_fallback) isEmbeddedDistributor() -> stringProvider.getString(R.string.unifiedpush_distributor_fcm_fallback)
isBackgroundSync() -> stringProvider.getString(R.string.unifiedpush_distributor_background_sync) isBackgroundSync() -> stringProvider.getString(R.string.unifiedpush_distributor_background_sync)
else -> context.getApplicationLabel(up.getDistributor(context)) else -> context.getApplicationLabel(up.getDistributor(context))
} }
} }