Commit 220dd0f
committed
Bring back code to fix database encryption
- Encrypting database if found unencrypted => that will allow seamless upgrade directly from 12.0 or 12.1 to 13.0
- Reverted verifyDatabaseAccess to its previous implementation: only checking that database is readable (not checking if SQLCipher was properly linked) otherwise the fix database method would not work
- Added a check for SQLCipher linking in openStoreQueueWithName
Tested manually:
- ran `MobileSyncExplorerSwift` without the call to goodConnection and with a bad podfile (I added `pod 'FMDB', :git => 'https://github.com/ccgus/fmdb', :tag => '2.7.12'` to the target)
- then ran `MobileSyncExplorerSwift` with the new code: made sure `fixFor12Bug` found the database in needs of being encrypted and encrypted it
- then ran `MobileSyncExplorerSwift` a second time and made sure `fixFor12Bug` no longer found the database in needs of being encrypted1 parent 788f21b commit 220dd0f
1 file changed
Lines changed: 26 additions & 1 deletion
Lines changed: 26 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
146 | 146 | | |
147 | 147 | | |
148 | 148 | | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
149 | 169 | | |
150 | 170 | | |
| 171 | + | |
| 172 | + | |
151 | 173 | | |
152 | 174 | | |
153 | 175 | | |
154 | 176 | | |
155 | 177 | | |
| 178 | + | |
156 | 179 | | |
157 | 180 | | |
158 | 181 | | |
| |||
419 | 442 | | |
420 | 443 | | |
421 | 444 | | |
422 | | - | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
423 | 448 | | |
424 | 449 | | |
425 | 450 | | |
| |||
0 commit comments