mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 06:51:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12184 from nextcloud/refactor/convert-events-to-kt

Browse source 
Convert Events to Kotlin
This commit is contained in:
Alper Öztürk 2023-12-05 11:35:29 +01:00 committed by GitHub
commit 646f0b4c45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 84 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/owncloud/android/ui/events/AccountRemovedEvent.java → app/src/main/java/com/owncloud/android/ui/events/AccountRemovedEvent.kt
View file

@ -18,13 +18,9 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
package com.owncloud.android.ui.events
/**
* Event that notifies that an account was removed
*/
public class AccountRemovedEvent {
}
class AccountRemovedEvent

7
app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.java → app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.kt
View file

@ -15,12 +15,11 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http:></http:>//www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
package com.owncloud.android.ui.events
/**
* Currently a dummy event to restore grid view, sort, and search
*/
public class ChangeMenuEvent {
}
class ChangeMenuEvent

11
app/src/main/java/com/owncloud/android/ui/events/CommentsEvent.java → app/src/main/java/com/owncloud/android/ui/events/CommentsEvent.kt
View file

@ -18,16 +18,9 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
package com.owncloud.android.ui.events
/**
* Event for refreshing comment state of a file
*/
public class CommentsEvent {
public final String remoteId;
public CommentsEvent(String remoteId) {
this.remoteId = remoteId;
}
}
class CommentsEvent(val remoteId: String)

7
app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.java → app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.kt
View file

@ -15,12 +15,11 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http:></http:>//www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
package com.owncloud.android.ui.events
/**
* Dummy drawer event
*/
public class DummyDrawerEvent {
}
class DummyDrawerEvent

37
app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.java
View file

@ -1,37 +0,0 @@
/*
* Nextcloud Android client application
*
* @author Tobias Kaminsky
* Copyright (C) 2017 Tobias Kaminsky
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
/**
* Event for set folder as encrypted/decrypted
*/
public class EncryptionEvent {
public final long localId;
public final String remotePath;
public final String remoteId;
public final boolean shouldBeEncrypted;
public EncryptionEvent(long localId, String remoteId, String remotePath, boolean shouldBeEncrypted) {
this.localId = localId;
this.remoteId = remoteId;
this.remotePath = remotePath;
this.shouldBeEncrypted = shouldBeEncrypted;
}
}

30
app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.kt Normal file
View file

@ -0,0 +1,30 @@
/*
* Nextcloud Android client application
*
* @author Tobias Kaminsky
* Copyright (C) 2017 Tobias Kaminsky
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events
/**
* Event for set folder as encrypted/decrypted
*/
class EncryptionEvent(
val localId: Long,
val remoteId: String,
val remotePath: String,
val shouldBeEncrypted: Boolean
)

33
app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.java
View file

@ -1,33 +0,0 @@
/**
* Nextcloud Android client application
*
* @author Mario Danic
* Copyright (C) 2017 Mario Danic
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
/**
* Event for making favoriting work
*/
public class FavoriteEvent {
public final String remotePath;
public final boolean shouldFavorite;
public FavoriteEvent(String remotePath, boolean shouldFavorite) {
this.remotePath = remotePath;
this.shouldFavorite = shouldFavorite;
}
}

15
app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.java → app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.kt
View file

@ -15,14 +15,11 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http:></http:>//www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
package com.owncloud.android.ui.events
public class VCardToggleEvent {
public boolean showRestoreButton;
public VCardToggleEvent(boolean showRestore) {
this.showRestoreButton = showRestore;
}
}
/**
* Event for making favoriting work
*/
class FavoriteEvent(val remotePath: String, val shouldFavorite: Boolean)

35
app/src/main/java/com/owncloud/android/ui/events/InitiateSyncedFolder.java
View file

@ -1,35 +0,0 @@
/**
* Nextcloud Android client application
*
* @author Mario Danic
* Copyright (C) 2017 Mario Danic
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
import com.owncloud.android.datamodel.SyncedFolder;
public class InitiateSyncedFolder {
private final SyncedFolder syncedFolder;
public InitiateSyncedFolder(SyncedFolder syncedFolder) {
this.syncedFolder = syncedFolder;
}
public SyncedFolder getSyncedFolder() {
return syncedFolder;
}
}

33
app/src/main/java/com/owncloud/android/ui/events/MenuItemClickEvent.java
View file

@ -1,33 +0,0 @@
/**
* Nextcloud Android client application
*
* @author Mario Danic
* Copyright (C) 2017 Mario Danic
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
import android.view.MenuItem;
/**
* Menu item click event
*/
public class MenuItemClickEvent {
public final MenuItem menuItem;
public MenuItemClickEvent(MenuItem menuItem) {
this.menuItem = menuItem;
}
}

5
app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.java → app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.kt
View file

@ -17,10 +17,9 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events;
package com.owncloud.android.ui.events
/**
* Event to send push token where it belongs
*/
public class TokenPushEvent {
}
class TokenPushEvent

22
app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.kt Normal file
View file

@ -0,0 +1,22 @@
/**
* Nextcloud Android client application
*
* @author Mario Danic
* Copyright (C) 2017 Mario Danic
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http:></http:>//www.gnu.org/licenses/>.
*/
package com.owncloud.android.ui.events
class VCardToggleEvent(var showRestoreButton: Boolean)

8
app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file

@ -783,13 +783,13 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
OwnCloudClient client = clientFactory.create(user);
ToggleFavoriteRemoteOperation toggleFavoriteOperation = new ToggleFavoriteRemoteOperation(
event.shouldFavorite, event.remotePath);
event.getShouldFavorite(), event.getRemotePath());
RemoteOperationResult remoteOperationResult = toggleFavoriteOperation.execute(client);
if (remoteOperationResult.isSuccess()) {
getFile().setFavorite(event.shouldFavorite);
OCFile file = storageManager.getFileByEncryptedRemotePath(event.remotePath);
file.setFavorite(event.shouldFavorite);
getFile().setFavorite(event.getShouldFavorite());
OCFile file = storageManager.getFileByEncryptedRemotePath(event.getRemotePath());
file.setFavorite(event.getShouldFavorite());
storageManager.saveFile(file);
}

18
app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -1588,7 +1588,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
@Subscribe(threadMode = ThreadMode.BACKGROUND)
public void onMessageEvent(CommentsEvent event) {
mAdapter.refreshCommentsCount(event.remoteId);
mAdapter.refreshCommentsCount(event.getRemoteId());
}
@Subscribe(threadMode = ThreadMode.BACKGROUND)
@ -1598,13 +1598,13 @@ public class OCFileListFragment extends ExtendedListFragment implements
OwnCloudClient client = clientFactory.create(user);
ToggleFavoriteRemoteOperation toggleFavoriteOperation = new ToggleFavoriteRemoteOperation(
event.shouldFavorite, event.remotePath);
event.getShouldFavorite(), event.getRemotePath());
RemoteOperationResult remoteOperationResult = toggleFavoriteOperation.execute(client);
if (remoteOperationResult.isSuccess()) {
boolean removeFromList = currentSearchType == SearchType.FAVORITE_SEARCH && !event.shouldFavorite;
boolean removeFromList = currentSearchType == SearchType.FAVORITE_SEARCH && !event.getShouldFavorite();
setEmptyListMessage(SearchType.FAVORITE_SEARCH);
mAdapter.setFavoriteAttributeForItemID(event.remotePath, event.shouldFavorite, removeFromList);
mAdapter.setFavoriteAttributeForItemID(event.getRemotePath(), event.getShouldFavorite(), removeFromList);
}
} catch (ClientFactory.CreationException e) {
@ -1692,7 +1692,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
String privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY);
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
OCFile file = storageManager.getFileByRemoteId(event.remoteId);
OCFile file = storageManager.getFileByRemoteId(event.getRemoteId());
if (publicKey.isEmpty() || privateKey.isEmpty()) {
Log_OC.d(TAG, "no public key for " + user.getAccountName());
@ -1706,10 +1706,10 @@ public class OCFileListFragment extends ExtendedListFragment implements
dialog.show(getParentFragmentManager(), SETUP_ENCRYPTION_DIALOG_TAG);
} else {
encryptFolder(file,
event.localId,
event.remoteId,
event.remotePath,
event.shouldBeEncrypted,
event.getLocalId(),
event.getRemoteId(),
event.getRemotePath(),
event.getShouldBeEncrypted(),
publicKey,
privateKey);
}

2
app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListFragment.java
View file

@ -270,7 +270,7 @@ public class BackupListFragment extends FileFragment implements Injectable {
@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(VCardToggleEvent event) {
if (event.showRestoreButton) {
if (event.getShowRestoreButton()) {
binding.contactlistRestoreSelectedContainer.setVisibility(View.VISIBLE);
} else {
binding.contactlistRestoreSelectedContainer.setVisibility(View.GONE);