nextcloud
/
android
mirror of https://github.com/nextcloud/android
0
0
Fork 0
Code Issues Releases Wiki Activity

Solve conflicts 

Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2023-12-13 14:36:02 +01:00
parent c238143a0b
commit a5aa4ebc3b
No known key found for this signature in database
GPG Key ID: 4E577DC593B59BDF
5 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt
View File

@ -49,6 +49,7 @@ import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.lib.resources.users.DeleteAppPasswordRemoteOperation
import com.owncloud.android.lib.resources.users.RemoteWipeSuccessRemoteOperation
import com.owncloud.android.providers.DocumentsStorageProvider
import com.owncloud.android.ui.activity.ContactsPreferenceActivity
import com.owncloud.android.ui.activity.ManageAccountsActivity
import com.owncloud.android.ui.events.AccountRemovedEvent
import com.owncloud.android.utils.EncryptionUtils

1
app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt
View File

@ -47,6 +47,7 @@ import com.owncloud.android.files.services.NameCollisionPolicy
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.services.OperationsService
import com.owncloud.android.services.OperationsService.OperationsServiceBinder
import com.owncloud.android.ui.activity.ContactsPreferenceActivity
import ezvcard.Ezvcard
import ezvcard.VCardVersion
import java.io.File

1
app/src/main/java/com/nextcloud/client/migrations/Migrations.kt
View File

@ -24,6 +24,7 @@ import com.nextcloud.client.account.UserAccountManager
import com.nextcloud.client.jobs.BackgroundJobManager
import com.nextcloud.client.logger.Logger
import com.owncloud.android.datamodel.ArbitraryDataProvider
import com.owncloud.android.ui.activity.ContactsPreferenceActivity
import javax.inject.Inject
/**

179
app/src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.kt
View File

@ -20,134 +20,129 @@
* 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.activity;
package com.owncloud.android.ui.activity
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import com.nextcloud.client.account.User;
import com.nextcloud.client.jobs.BackgroundJobManager;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.fragment.contactsbackup.BackupFragment;
import com.owncloud.android.ui.fragment.contactsbackup.BackupListFragment;
import javax.inject.Inject;
import androidx.activity.OnBackPressedCallback;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
import androidx.activity.OnBackPressedCallback
import androidx.drawerlayout.widget.DrawerLayout
import androidx.fragment.app.FragmentManager
import com.nextcloud.client.account.User
import com.nextcloud.client.jobs.BackgroundJobManager
import com.owncloud.android.R
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.ui.fragment.FileFragment
import com.owncloud.android.ui.fragment.contactsbackup.BackupFragment
import com.owncloud.android.ui.fragment.contactsbackup.BackupFragment.Companion.create
import com.owncloud.android.ui.fragment.contactsbackup.BackupListFragment
import javax.inject.Inject
/**
* This activity shows all settings for contact backup/restore
*/
public class ContactsPreferenceActivity extends FileActivity implements FileFragment.ContainerActivity {
public static final String TAG = ContactsPreferenceActivity.class.getSimpleName();
public static final String EXTRA_FILE = "FILE";
public static final String EXTRA_USER = "USER";
/**
* Warning: default for this extra is different between this activity and {@link BackupFragment}
*/
public static final String EXTRA_SHOW_SIDEBAR = "SHOW_SIDEBAR";
public static final String PREFERENCE_CONTACTS_AUTOMATIC_BACKUP = "PREFERENCE_CONTACTS_AUTOMATIC_BACKUP";
public static final String PREFERENCE_CONTACTS_LAST_BACKUP = "PREFERENCE_CONTACTS_LAST_BACKUP";
public static final String BACKUP_TO_LIST = "BACKUP_TO_LIST";
@Inject BackgroundJobManager backgroundJobManager;
public static void startActivity(Context context) {
Intent intent = new Intent(context, ContactsPreferenceActivity.class);
context.startActivity(intent);
}
public static void startActivityWithContactsFile(Context context, User user, OCFile file) {
Intent intent = new Intent(context, ContactsPreferenceActivity.class);
intent.putExtra(EXTRA_FILE, file);
intent.putExtra(EXTRA_USER, user);
context.startActivity(intent);
}
public static void startActivityWithoutSidebar(Context context) {
Intent intent = new Intent(context, ContactsPreferenceActivity.class);
intent.putExtra(EXTRA_SHOW_SIDEBAR, false);
context.startActivity(intent);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.contacts_preference);
class ContactsPreferenceActivity : FileActivity(), FileFragment.ContainerActivity {
@JvmField
@Inject
var backgroundJobManager: BackgroundJobManager? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.contacts_preference)
// setup toolbar
setupToolbar();
setupToolbar()
// setup drawer
//setupDrawer(R.id.nav_contacts); // TODO needed?
// setupDrawer(R.id.nav_contacts); // TODO needed?
// show sidebar?
boolean showSidebar = getIntent().getBooleanExtra(EXTRA_SHOW_SIDEBAR, true);
val showSidebar = intent.getBooleanExtra(EXTRA_SHOW_SIDEBAR, true)
if (!showSidebar) {
setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
if (supportActionBar != null) {
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
}
if (mDrawerToggle != null) {
mDrawerToggle.setDrawerIndicatorEnabled(false);
mDrawerToggle.isDrawerIndicatorEnabled = false
}
}
Intent intent = getIntent();
if (savedInstanceState == null) {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
if (intent == null || intent.getParcelableExtra(EXTRA_FILE) == null ||
intent.getParcelableExtra(EXTRA_USER) == null) {
BackupFragment fragment = BackupFragment.create(showSidebar);
transaction.add(R.id.frame_container, fragment);
val transaction = supportFragmentManager.beginTransaction()
if (intent?.getParcelableExtra<Parcelable?>(EXTRA_FILE) == null || intent.getParcelableExtra<Parcelable?>(
EXTRA_USER
) == null
) {
val fragment = create(showSidebar)
transaction.add(R.id.frame_container, fragment)
} else {
OCFile file = intent.getParcelableExtra(EXTRA_FILE);
User user = intent.getParcelableExtra(EXTRA_USER);
BackupListFragment contactListFragment = BackupListFragment.newInstance(file, user);
transaction.add(R.id.frame_container, contactListFragment);
val file = intent.getParcelableExtra<OCFile>(EXTRA_FILE)
val user = intent.getParcelableExtra<User>(EXTRA_USER)
val contactListFragment = BackupListFragment.newInstance(file, user)
transaction.add(R.id.frame_container, contactListFragment)
}
transaction.commit();
transaction.commit()
}
getOnBackPressedDispatcher().addCallback(this, onBackPressedCallback);
onBackPressedDispatcher.addCallback(this, onBackPressedCallback)
}
@Override
public void showDetails(OCFile file) {
override fun showDetails(file: OCFile) {
// not needed
}
@Override
public void showDetails(OCFile file, int activeTab) {
override fun showDetails(file: OCFile, activeTab: Int) {
// not needed
}
@Override
public void onBrowsedDownTo(OCFile folder) {
override fun onBrowsedDownTo(folder: OCFile) {
// not needed
}
@Override
public void onTransferStateChanged(OCFile file, boolean downloading, boolean uploading) {
override fun onTransferStateChanged(file: OCFile, downloading: Boolean, uploading: Boolean) {
// not needed
}
private final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {
if (getSupportFragmentManager().findFragmentByTag(BackupListFragment.TAG) != null) {
getSupportFragmentManager().popBackStack(BACKUP_TO_LIST, FragmentManager.POP_BACK_STACK_INCLUSIVE);
private val onBackPressedCallback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
if (supportFragmentManager.findFragmentByTag(BackupListFragment.TAG) != null) {
supportFragmentManager.popBackStack(BACKUP_TO_LIST, FragmentManager.POP_BACK_STACK_INCLUSIVE)
} else {
finish();
finish()
}
}
};
}
companion object {
val TAG = ContactsPreferenceActivity::class.java.simpleName
const val EXTRA_FILE = "FILE"
const val EXTRA_USER = "USER"
/**
* Warning: default for this extra is different between this activity and [BackupFragment]
*/
const val EXTRA_SHOW_SIDEBAR = "SHOW_SIDEBAR"
const val PREFERENCE_CONTACTS_AUTOMATIC_BACKUP = "PREFERENCE_CONTACTS_AUTOMATIC_BACKUP"
const val PREFERENCE_CONTACTS_LAST_BACKUP = "PREFERENCE_CONTACTS_LAST_BACKUP"
const val BACKUP_TO_LIST = "BACKUP_TO_LIST"
fun startActivity(context: Context) {
val intent = Intent(context, ContactsPreferenceActivity::class.java)
context.startActivity(intent)
}
@JvmStatic
fun startActivityWithContactsFile(context: Context, user: User?, file: OCFile?) {
val intent = Intent(context, ContactsPreferenceActivity::class.java)
intent.putExtra(EXTRA_FILE, file)
intent.putExtra(EXTRA_USER, user)
context.startActivity(intent)
}
@JvmStatic
fun startActivityWithoutSidebar(context: Context) {
val intent = Intent(context, ContactsPreferenceActivity::class.java)
intent.putExtra(EXTRA_SHOW_SIDEBAR, false)
context.startActivity(intent)
}
}
}

1
app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupFragment.kt
View File

@ -47,6 +47,7 @@ import com.owncloud.android.datamodel.FileDataStorageManager
import com.owncloud.android.datamodel.OCFile
import com.owncloud.android.lib.common.utils.Log_OC
import com.owncloud.android.operations.RefreshFolderOperation
import com.owncloud.android.ui.activity.ContactsPreferenceActivity
import com.owncloud.android.ui.activity.SettingsActivity
import com.owncloud.android.ui.fragment.FileFragment
import com.owncloud.android.utils.DisplayUtils