GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-28 07:19:32 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/minor-fixess' into 'main'

Browse Source 
Krille/minor fixess

See merge request famedly/fluffychat!782
This commit is contained in:
Krille Fear 2022-03-20 15:05:37 +00:00
commit daf7cda60e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/AndroidManifest.xml
View File

@ -93,7 +93,8 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.linusu.flutter_web_auth.CallbackActivity" > <activity android:name="com.linusu.flutter_web_auth.CallbackActivity"
android:exported="true">
<intent-filter android:label="flutter_web_auth"> <intent-filter android:label="flutter_web_auth">
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

1
lib/pages/chat/chat.dart
View File

@ -148,6 +148,7 @@ class ChatController extends State<Chat> {
return; return;
} }
setReadMarker(); setReadMarker();
if (!scrollController.hasClients) return;
if (scrollController.position.pixels == if (scrollController.position.pixels ==
scrollController.position.maxScrollExtent && scrollController.position.maxScrollExtent &&
timeline!.events.isNotEmpty && timeline!.events.isNotEmpty &&

4
lib/utils/background_push.dart
View File

@ -289,13 +289,13 @@ class BackgroundPush {
Future<void> goToRoom(String? roomId) async { Future<void> goToRoom(String? roomId) async {
try { try {
Logs().v('[Push] Attempting to go to room $roomId...'); Logs().v('[Push] Attempting to go to room $roomId...');
if (router == null) { if (router == null || roomId == null) {
return; return;
} }
await client.roomsLoading; await client.roomsLoading;
await client.accountDataLoading; await client.accountDataLoading;
final isStory = client final isStory = client
.getRoomById(roomId!) .getRoomById(roomId)
?.getState(EventTypes.RoomCreate) ?.getState(EventTypes.RoomCreate)
?.content ?.content
.tryGet<String>('type') == .tryGet<String>('type') ==