mirror of https://github.com/vector-im/riot-web
				
				
				
			apply changes from review
							parent
							
								
									bd9cebe35d
								
							
						
					
					
						commit
						c1765c857e
					
				| 
						 | 
					@ -473,7 +473,7 @@ async function _doSetLoggedIn(credentials, clearStorage) {
 | 
				
			||||||
    MatrixClientPeg.replaceUsingCreds(credentials);
 | 
					    MatrixClientPeg.replaceUsingCreds(credentials);
 | 
				
			||||||
    const client = MatrixClientPeg.get();
 | 
					    const client = MatrixClientPeg.get();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (credentials.freshLogin) {
 | 
					    if (credentials.freshLogin && SettingsStore.getValue("feature_dehydration")) {
 | 
				
			||||||
        // If we just logged in, try to rehydrate a device instead of using a
 | 
					        // If we just logged in, try to rehydrate a device instead of using a
 | 
				
			||||||
        // new device.  If it succeeds, we'll get a new device ID, so make sure
 | 
					        // new device.  If it succeeds, we'll get a new device ID, so make sure
 | 
				
			||||||
        // we persist that ID to localStorage
 | 
					        // we persist that ID to localStorage
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -188,7 +188,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "feature_dehydration": {
 | 
					    "feature_dehydration": {
 | 
				
			||||||
        isFeature: true,
 | 
					        isFeature: true,
 | 
				
			||||||
        displayName: _td("Offline encrypted messaging using dehydrated devices."),
 | 
					        displayName: _td("Offline encrypted messaging using dehydrated devices"),
 | 
				
			||||||
        supportedLevels: LEVELS_FEATURE,
 | 
					        supportedLevels: LEVELS_FEATURE,
 | 
				
			||||||
        default: false,
 | 
					        default: false,
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue