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

Commit 10466cd4 authored by michaelenoma's avatar michaelenoma
Browse files

Build fix for Apple M1 chip

parent 40ffae4d
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ android {

    buildFeatures {
        viewBinding true
        dataBinding true
    }

    buildTypes {
@@ -102,8 +101,8 @@ dependencies {
    implementation 'com.google.android.material:material:1.4.0'

    // Database
    implementation 'androidx.room:room-runtime:2.3.0'
    annotationProcessor 'androidx.room:room-compiler:2.3.0'
    implementation 'androidx.room:room-runtime:2.4.0'
    annotationProcessor 'androidx.room:room-compiler:2.4.0'

    // Retrofit
    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+18 −0
Original line number Diff line number Diff line
package it.niedermann.owncloud.notes.importaccount;

import android.accounts.AccountManager;
import android.accounts.NetworkErrorException;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
@@ -38,6 +40,18 @@ import it.niedermann.owncloud.notes.shared.model.IResponseCallback;

public class ImportAccountActivity extends AppCompatActivity {


    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 final static int pick_account_request_code = 1;

    private AccountManager accountManager;
    private SharedPreferences sharedPreferences;


    private static final String TAG = ImportAccountActivity.class.getSimpleName();
    public static final int REQUEST_CODE_IMPORT_ACCOUNT = 1;

@@ -57,6 +71,8 @@ public class ImportAccountActivity extends AppCompatActivity {

        setContentView(binding.getRoot());

        accountManager = AccountManager.get(this);

        binding.welcomeText.setText(getString(R.string.welcome_text, getString(R.string.app_name)));
        binding.addButton.setOnClickListener((v) -> {
            binding.addButton.setEnabled(false);
@@ -73,6 +89,8 @@ public class ImportAccountActivity extends AppCompatActivity {
                AccountImporter.requestAndroidAccountPermissionsAndPickAccount(this);
            }
        });


    }

    @Override