mirror of
				https://gitlab.com/famedly/fluffychat.git
				synced 2025-11-03 22:07:23 +01:00 
			
		
		
		
	Merge branch 'update-UP' into 'main'
update unifiedpush Closes #286 See merge request famedly/fluffychat!432
This commit is contained in:
		
						commit
						77afe77f0e
					
				@ -85,7 +85,7 @@ dependencies {
 | 
			
		||||
    androidTestImplementation 'androidx.test:runner:1.1.1'
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 | 
			
		||||
    implementation "net.zetetic:android-database-sqlcipher:4.4.0" // needed for moor_ffi w/ sqlcipher
 | 
			
		||||
    implementation 'com.github.UnifiedPush:android-connector:1.1.0' // needed for unifiedpush
 | 
			
		||||
    implementation 'com.github.UnifiedPush:android-connector:1.2.0' // needed for unifiedpush
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
if(file("google-services.json").exists()){
 | 
			
		||||
 | 
			
		||||
@ -313,19 +313,7 @@ class BackgroundPush {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> setupUp() async {
 | 
			
		||||
    if (!(await store.getItemBool(SettingKeys.unifiedPushRegistered, false))) {
 | 
			
		||||
      Logs().i('[Push] UnifiedPush not registered, attempting to do so...');
 | 
			
		||||
      await UnifiedPush.registerAppWithDialog();
 | 
			
		||||
    } else {
 | 
			
		||||
      // make sure the endpoint is up-to-date etc.
 | 
			
		||||
      await _newUpEndpoint(
 | 
			
		||||
          await store.getItem(SettingKeys.unifiedPushEndpoint));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // re-register the app without a dialog. This should be safe,
 | 
			
		||||
    // and allows recovering from app deletion in gotify, for instance
 | 
			
		||||
    Logs().i('[Push] UnifiedPush registration found, re-registering');
 | 
			
		||||
    await UnifiedPush.registerApp();
 | 
			
		||||
    await UnifiedPush.registerAppWithDialog();
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  Future<void> _onFcmMessage(Map<dynamic, dynamic> message) async {
 | 
			
		||||
 | 
			
		||||
@ -1170,7 +1170,7 @@ packages:
 | 
			
		||||
      name: unifiedpush
 | 
			
		||||
      url: "https://pub.dartlang.org"
 | 
			
		||||
    source: hosted
 | 
			
		||||
    version: "1.0.2"
 | 
			
		||||
    version: "1.0.6"
 | 
			
		||||
  universal_html:
 | 
			
		||||
    dependency: "direct main"
 | 
			
		||||
    description:
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user