mirror of
https://github.com/nextcloud/android.git
synced 2024-11-24 06:05:42 +03:00
Convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
parent
61e3d992ee
commit
4d8c97e635
13 changed files with 39 additions and 142 deletions
|
@ -18,13 +18,9 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* 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://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
package com.owncloud.android.ui.events
|
||||||
package com.owncloud.android.ui.events;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Event that notifies that an account was removed
|
* Event that notifies that an account was removed
|
||||||
*/
|
*/
|
||||||
|
class AccountRemovedEvent
|
||||||
public class AccountRemovedEvent {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
@ -15,12 +15,11 @@
|
||||||
* GNU Affero General Public License for more details.
|
* GNU Affero General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* 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
|
* Currently a dummy event to restore grid view, sort, and search
|
||||||
*/
|
*/
|
||||||
public class ChangeMenuEvent {
|
class ChangeMenuEvent
|
||||||
}
|
|
||||||
|
|
|
@ -18,16 +18,9 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* 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
|
* Event for refreshing comment state of a file
|
||||||
*/
|
*/
|
||||||
public class CommentsEvent {
|
class CommentsEvent(val remoteId: String)
|
||||||
public final String remoteId;
|
|
||||||
|
|
||||||
public CommentsEvent(String remoteId) {
|
|
||||||
this.remoteId = remoteId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -15,12 +15,11 @@
|
||||||
* GNU Affero General Public License for more details.
|
* GNU Affero General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* 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
|
* Dummy drawer event
|
||||||
*/
|
*/
|
||||||
public class DummyDrawerEvent {
|
class DummyDrawerEvent
|
||||||
}
|
|
||||||
|
|
|
@ -17,21 +17,14 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* 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://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package com.owncloud.android.ui.events;
|
package com.owncloud.android.ui.events
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Event for set folder as encrypted/decrypted
|
* Event for set folder as encrypted/decrypted
|
||||||
*/
|
*/
|
||||||
public class EncryptionEvent {
|
class EncryptionEvent(
|
||||||
public final long localId;
|
val localId: Long,
|
||||||
public final String remotePath;
|
val remoteId: String,
|
||||||
public final String remoteId;
|
val remotePath: String,
|
||||||
public final boolean shouldBeEncrypted;
|
val shouldBeEncrypted: Boolean
|
||||||
|
)
|
||||||
public EncryptionEvent(long localId, String remoteId, String remotePath, boolean shouldBeEncrypted) {
|
|
||||||
this.localId = localId;
|
|
||||||
this.remoteId = remoteId;
|
|
||||||
this.remotePath = remotePath;
|
|
||||||
this.shouldBeEncrypted = shouldBeEncrypted;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -15,19 +15,11 @@
|
||||||
* GNU Affero General Public License for more details.
|
* GNU Affero General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* 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
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Event for making favoriting work
|
* Event for making favoriting work
|
||||||
*/
|
*/
|
||||||
public class FavoriteEvent {
|
class FavoriteEvent(val remotePath: String, val shouldFavorite: Boolean)
|
||||||
public final String remotePath;
|
|
||||||
public final boolean shouldFavorite;
|
|
||||||
|
|
||||||
public FavoriteEvent(String remotePath, boolean shouldFavorite) {
|
|
||||||
this.remotePath = remotePath;
|
|
||||||
this.shouldFavorite = shouldFavorite;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -17,10 +17,9 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* 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://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package com.owncloud.android.ui.events;
|
package com.owncloud.android.ui.events
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Event to send push token where it belongs
|
* Event to send push token where it belongs
|
||||||
*/
|
*/
|
||||||
public class TokenPushEvent {
|
class TokenPushEvent
|
||||||
}
|
|
||||||
|
|
|
@ -15,14 +15,8 @@
|
||||||
* GNU Affero General Public License for more details.
|
* GNU Affero General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* 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 {
|
class VCardToggleEvent(var showRestoreButton: Boolean)
|
||||||
public boolean showRestoreButton;
|
|
||||||
|
|
||||||
public VCardToggleEvent(boolean showRestore) {
|
|
||||||
this.showRestoreButton = showRestore;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -783,13 +783,13 @@ public class FileDetailFragment extends FileFragment implements OnClickListener,
|
||||||
OwnCloudClient client = clientFactory.create(user);
|
OwnCloudClient client = clientFactory.create(user);
|
||||||
|
|
||||||
ToggleFavoriteRemoteOperation toggleFavoriteOperation = new ToggleFavoriteRemoteOperation(
|
ToggleFavoriteRemoteOperation toggleFavoriteOperation = new ToggleFavoriteRemoteOperation(
|
||||||
event.shouldFavorite, event.remotePath);
|
event.getShouldFavorite(), event.getRemotePath());
|
||||||
RemoteOperationResult remoteOperationResult = toggleFavoriteOperation.execute(client);
|
RemoteOperationResult remoteOperationResult = toggleFavoriteOperation.execute(client);
|
||||||
|
|
||||||
if (remoteOperationResult.isSuccess()) {
|
if (remoteOperationResult.isSuccess()) {
|
||||||
getFile().setFavorite(event.shouldFavorite);
|
getFile().setFavorite(event.getShouldFavorite());
|
||||||
OCFile file = storageManager.getFileByEncryptedRemotePath(event.remotePath);
|
OCFile file = storageManager.getFileByEncryptedRemotePath(event.getRemotePath());
|
||||||
file.setFavorite(event.shouldFavorite);
|
file.setFavorite(event.getShouldFavorite());
|
||||||
storageManager.saveFile(file);
|
storageManager.saveFile(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1588,7 +1588,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.BACKGROUND)
|
@Subscribe(threadMode = ThreadMode.BACKGROUND)
|
||||||
public void onMessageEvent(CommentsEvent event) {
|
public void onMessageEvent(CommentsEvent event) {
|
||||||
mAdapter.refreshCommentsCount(event.remoteId);
|
mAdapter.refreshCommentsCount(event.getRemoteId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.BACKGROUND)
|
@Subscribe(threadMode = ThreadMode.BACKGROUND)
|
||||||
|
@ -1598,13 +1598,13 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
||||||
OwnCloudClient client = clientFactory.create(user);
|
OwnCloudClient client = clientFactory.create(user);
|
||||||
|
|
||||||
ToggleFavoriteRemoteOperation toggleFavoriteOperation = new ToggleFavoriteRemoteOperation(
|
ToggleFavoriteRemoteOperation toggleFavoriteOperation = new ToggleFavoriteRemoteOperation(
|
||||||
event.shouldFavorite, event.remotePath);
|
event.getShouldFavorite(), event.getRemotePath());
|
||||||
RemoteOperationResult remoteOperationResult = toggleFavoriteOperation.execute(client);
|
RemoteOperationResult remoteOperationResult = toggleFavoriteOperation.execute(client);
|
||||||
|
|
||||||
if (remoteOperationResult.isSuccess()) {
|
if (remoteOperationResult.isSuccess()) {
|
||||||
boolean removeFromList = currentSearchType == SearchType.FAVORITE_SEARCH && !event.shouldFavorite;
|
boolean removeFromList = currentSearchType == SearchType.FAVORITE_SEARCH && !event.getShouldFavorite();
|
||||||
setEmptyListMessage(SearchType.FAVORITE_SEARCH);
|
setEmptyListMessage(SearchType.FAVORITE_SEARCH);
|
||||||
mAdapter.setFavoriteAttributeForItemID(event.remotePath, event.shouldFavorite, removeFromList);
|
mAdapter.setFavoriteAttributeForItemID(event.getRemotePath(), event.getShouldFavorite(), removeFromList);
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (ClientFactory.CreationException e) {
|
} catch (ClientFactory.CreationException e) {
|
||||||
|
@ -1692,7 +1692,7 @@ public class OCFileListFragment extends ExtendedListFragment implements
|
||||||
String privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY);
|
String privateKey = arbitraryDataProvider.getValue(user, EncryptionUtils.PRIVATE_KEY);
|
||||||
|
|
||||||
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
|
FileDataStorageManager storageManager = mContainerActivity.getStorageManager();
|
||||||
OCFile file = storageManager.getFileByRemoteId(event.remoteId);
|
OCFile file = storageManager.getFileByRemoteId(event.getRemoteId());
|
||||||
|
|
||||||
if (publicKey.isEmpty() || privateKey.isEmpty()) {
|
if (publicKey.isEmpty() || privateKey.isEmpty()) {
|
||||||
Log_OC.d(TAG, "no public key for " + user.getAccountName());
|
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);
|
dialog.show(getParentFragmentManager(), SETUP_ENCRYPTION_DIALOG_TAG);
|
||||||
} else {
|
} else {
|
||||||
encryptFolder(file,
|
encryptFolder(file,
|
||||||
event.localId,
|
event.getLocalId(),
|
||||||
event.remoteId,
|
event.getRemoteId(),
|
||||||
event.remotePath,
|
event.getRemotePath(),
|
||||||
event.shouldBeEncrypted,
|
event.getShouldBeEncrypted(),
|
||||||
publicKey,
|
publicKey,
|
||||||
privateKey);
|
privateKey);
|
||||||
}
|
}
|
||||||
|
|
|
@ -270,7 +270,7 @@ public class BackupListFragment extends FileFragment implements Injectable {
|
||||||
|
|
||||||
@Subscribe(threadMode = ThreadMode.MAIN)
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
||||||
public void onMessageEvent(VCardToggleEvent event) {
|
public void onMessageEvent(VCardToggleEvent event) {
|
||||||
if (event.showRestoreButton) {
|
if (event.getShowRestoreButton()) {
|
||||||
binding.contactlistRestoreSelectedContainer.setVisibility(View.VISIBLE);
|
binding.contactlistRestoreSelectedContainer.setVisibility(View.VISIBLE);
|
||||||
} else {
|
} else {
|
||||||
binding.contactlistRestoreSelectedContainer.setVisibility(View.GONE);
|
binding.contactlistRestoreSelectedContainer.setVisibility(View.GONE);
|
||||||
|
|
Loading…
Reference in a new issue