Skip to content

Commit fe83ba6

Browse files
committed
fix
Signed-off-by: alperozturk <[email protected]>
1 parent a6a60c5 commit fe83ba6

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ public static Capabilities getCapabilities(@NonNull Context context, @NonNull Si
4343
} else {
4444
Log.w(TAG, "Response headers of capabilities are null");
4545
}
46+
47+
final var repository = NotesRepository.getInstance(context);
48+
repository.insertCapabilities(capabilities);
49+
4650
return capabilities;
4751
} catch (RuntimeException e) {
4852
final var cause = e.getCause();

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,10 @@ public void updateCapabilitiesETag(long id, String capabilitiesETag) {
331331
db.getAccountDao().updateCapabilitiesETag(id, capabilitiesETag);
332332
}
333333

334+
public void insertCapabilities(Capabilities capabilities) {
335+
db.getCapabilitiesDao().insert(capabilities);
336+
}
337+
334338
public void updateModified(long id, long modified) {
335339
db.getAccountDao().updateModified(id, modified);
336340
}
@@ -339,7 +343,6 @@ public void updateDirectEditingAvailable(final long id, final boolean available)
339343
db.getAccountDao().updateDirectEditingAvailable(id, available);
340344
}
341345

342-
343346
// Notes
344347

345348
public LiveData<Note> getNoteById$(long id) {
@@ -876,6 +879,9 @@ public synchronized void scheduleSync(@Nullable Account account, boolean onlyLoc
876879
if (isSyncPossible() && (!Boolean.TRUE.equals(syncActive.get(account.getId())) || onlyLocalChanges)) {
877880
syncActive.put(account.getId(), true);
878881
try {
882+
final var ssoAccount = AccountImporter.getSingleSignOnAccount(context, account.getAccountName());
883+
CapabilitiesClient.getCapabilities(context,ssoAccount, null, ApiProvider.getInstance());
884+
879885
Log.d(TAG, "... starting now");
880886
final NotesServerSyncTask syncTask = new NotesServerSyncTask(context, this, account, onlyLocalChanges, apiProvider) {
881887
@Override
@@ -920,7 +926,7 @@ void onPostExecute(SyncResultStatus status) {
920926
callbacksPull.put(account.getId(), new ArrayList<>());
921927
}
922928
syncExecutor.submit(syncTask);
923-
} catch (NextcloudFilesAppAccountNotFoundException e) {
929+
} catch (Throwable e) {
924930
Log.e(TAG, "... Could not find " + SingleSignOnAccount.class.getSimpleName() + " for account name " + account.getAccountName());
925931
e.printStackTrace();
926932
}

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import android.provider.ContactsContract;
2020
import android.text.InputType;
2121
import android.text.TextUtils;
22+
import android.util.Log;
2223
import android.view.View;
2324
import android.view.ViewGroup;
2425
import android.view.inputmethod.EditorInfo;
@@ -149,9 +150,16 @@ private void initializeArguments() {
149150
executorService.submit(() -> {
150151
try {
151152
final var ssoAcc = SingleAccountHelper.getCurrentSingleSignOnAccount(NoteShareActivity.this);
153+
Log.i(TAG, "SSOAccount created");
154+
152155
repository = new ShareRepository(NoteShareActivity.this, ssoAcc);
156+
Log.i(TAG, "ShareRepository is created");
157+
153158
capabilities = repository.getCapabilities();
159+
Log.i(TAG, "Capabilities are fetched");
160+
154161
repository.getSharesForNotesAndSaveShareEntities();
162+
Log.i(TAG, "Notes share entities are fetched");
155163

156164
runOnUiThread(() -> {
157165
binding.searchContainer.setVisibility(View.VISIBLE);
@@ -171,7 +179,7 @@ private void initializeArguments() {
171179
binding.loadingLayout.setVisibility(View.GONE);
172180
});
173181
} catch (Exception e) {
174-
throw new RuntimeException(e);
182+
Log.e(TAG, "Exception at NoteShareActivity.init: " + e);
175183
}
176184
});
177185
}

0 commit comments

Comments
 (0)