Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adda826f authored by Michael Enoma's avatar Michael Enoma 👽
Browse files

Ecloud Sync

parent 72693431

app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java

+24 −18
Original line number Diff line number Diff line
@@ -70,16 +70,6 @@ import android.widget.ProgressBar; 
import android.widget.TextView;

import android.widget.Toast;



import foundation.e.cert4android.CustomCertManager;

import foundation.e.cert4android.IOnCertificateDecision;

import butterknife.BindView;

import butterknife.ButterKnife;

import foundation.e.notes.R;

import foundation.e.notes.persistence.NoteSQLiteOpenHelper;

import foundation.e.notes.persistence.NoteServerSyncHelper;

import foundation.e.notes.util.ExceptionHandler;

import foundation.e.notes.util.NotesClientUtil;

import foundation.e.notes.util.NotesClientUtil.LoginStatus;



import androidx.annotation.ColorInt;

import androidx.appcompat.app.AppCompatActivity;
@@ -103,7 +93,6 @@ import static android.os.Process.myPid; 


public class ImportAccountActivity extends AppCompatActivity {





    public static final String SETTINGS_URL = "settingsUrl";

    public static final String SETTINGS_USERNAME = "settingsUsername";

    public static final String SETTINGS_PASSWORD = "settingsPassword";
@@ -116,16 +105,21 @@ public class ImportAccountActivity extends AppCompatActivity { 
    public static final String LOGIN_URL_DATA_KEY_VALUE_SEPARATOR = ":";

    public static final String WEBDAV_PATH_4_0_AND_LATER = "/remote.php/webdav";



    private SharedPreferences preferences = null;

    View urlWarnHttp;

    private String old_password = "";



    private WebView webView;



    private boolean first_run = false;

    private boolean useWebLogin = true;





    private final static String key_login_account = "login_account";

    private final static String login_account_eelo = "login_account_eelo";

    private final static String login_account_manual = "login_account_manual";

    public final static String eelo_account_type = "e.foundation.webdav.eelo";



    private WebView webView;



    private boolean first_run = false;

    private boolean useWebLogin = true;



    private final static int pick_account_request_code = 1;
@@ -149,6 +143,8 @@ public class ImportAccountActivity extends AppCompatActivity { 


        binding = ActivityImportAccountBinding.inflate(getLayoutInflater());

        importAccountViewModel = new ViewModelProvider(this).get(ImportAccountViewModel.class);

        preferences = PreferenceManager

                .getDefaultSharedPreferences(getApplicationContext());



        setContentView(binding.getRoot());
@@ -172,10 +168,20 @@ public class ImportAccountActivity extends AppCompatActivity { 
        });



        binding.addButton1.setOnClickListener((v) -> {

            binding.addButton1.setEnabled(false);

            binding.addButton.setEnabled(false);

            binding.status.setVisibility(View.GONE);



            try {

                AccountImporter.pickNewAccount(this);

            } catch (NextcloudFilesAppNotInstalledException e) {

                UiExceptionManager.showDialogForException(this, e);

                Log.w(TAG, "=============================================================");

                Log.w(TAG, "Nextcloud app is not installed. Cannot choose account");

                e.printStackTrace();

            } catch (AndroidGetAccountsPermissionNotGranted e) {

                binding.addButton.setEnabled(true);

                AccountImporter.requestAndroidAccountPermissionsAndPickAccount(this);

            }

        });





    }