mirror of
				https://gitlab.com/famedly/fluffychat.git
				synced 2025-11-03 22:07:23 +01:00 
			
		
		
		
	Merge branch 'krille/minor-fixess' into 'main'
Krille/minor fixess See merge request famedly/fluffychat!782
This commit is contained in:
		
						commit
						daf7cda60e
					
				@ -93,7 +93,8 @@
 | 
			
		||||
            </intent-filter>
 | 
			
		||||
        </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">
 | 
			
		||||
                <action android:name="android.intent.action.VIEW" />
 | 
			
		||||
                <category android:name="android.intent.category.DEFAULT" />
 | 
			
		||||
 | 
			
		||||
@ -148,6 +148,7 @@ class ChatController extends State<Chat> {
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
    setReadMarker();
 | 
			
		||||
    if (!scrollController.hasClients) return;
 | 
			
		||||
    if (scrollController.position.pixels ==
 | 
			
		||||
            scrollController.position.maxScrollExtent &&
 | 
			
		||||
        timeline!.events.isNotEmpty &&
 | 
			
		||||
 | 
			
		||||
@ -289,13 +289,13 @@ class BackgroundPush {
 | 
			
		||||
  Future<void> goToRoom(String? roomId) async {
 | 
			
		||||
    try {
 | 
			
		||||
      Logs().v('[Push] Attempting to go to room $roomId...');
 | 
			
		||||
      if (router == null) {
 | 
			
		||||
      if (router == null || roomId == null) {
 | 
			
		||||
        return;
 | 
			
		||||
      }
 | 
			
		||||
      await client.roomsLoading;
 | 
			
		||||
      await client.accountDataLoading;
 | 
			
		||||
      final isStory = client
 | 
			
		||||
              .getRoomById(roomId!)
 | 
			
		||||
              .getRoomById(roomId)
 | 
			
		||||
              ?.getState(EventTypes.RoomCreate)
 | 
			
		||||
              ?.content
 | 
			
		||||
              .tryGet<String>('type') ==
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user