arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-02 19:01:06 +00:00
Code Issues Releases Wiki Activity

Collection deletion: mark as deleted in cache, but don't actually delete.

Browse Source 
This is important for protecting against potential data loss.
This commit is contained in:
Tom Hacohen 2017-03-24 18:51:37 +00:00
parent ba9f217d66
commit 3a83cf8303
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/etesync/syncadapter/ui/DeleteCollectionFragment.java
View File

@ -120,7 +120,9 @@ public class DeleteCollectionFragment extends DialogFragment implements LoaderMa
JournalManager journalManager = new JournalManager(HttpClient.create(getContext(), account), principal); JournalManager journalManager = new JournalManager(HttpClient.create(getContext(), account), principal);
journalManager.deleteJournal(new JournalManager.Journal(settings.password(), collectionInfo.toJson(), collectionInfo.url)); journalManager.deleteJournal(new JournalManager.Journal(settings.password(), collectionInfo.toJson(), collectionInfo.url));
data.delete(JournalEntity.fetch(data, collectionInfo.url)); JournalEntity journalEntity = JournalEntity.fetch(data, collectionInfo.url);
journalEntity.setDeleted(true);
data.update(journalEntity);
return null; return null;
} catch (Exceptions.HttpException e) { } catch (Exceptions.HttpException e) {

2
app/src/main/java/com/etesync/syncadapter/ui/ViewCollectionActivity.java
View File

@ -57,7 +57,7 @@ public class ViewCollectionActivity extends AppCompatActivity implements Refresh
int entryCount = -1; int entryCount = -1;
final JournalEntity journalEntity = JournalEntity.fetch(data, info.url); final JournalEntity journalEntity = JournalEntity.fetch(data, info.url);
if (journalEntity == null) { if ((journalEntity == null) || journalEntity.isDeleted()) {
finish(); finish();
return; return;
} }