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

Commit f1f14a5b authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

#1047 Catch creation shortcuts when no account is configured yet

parent 6f74c1cd
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -6,11 +6,16 @@ import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
import com.nextcloud.android.sso.helper.SingleAccountHelper;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -51,6 +56,16 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        
        try {
            if (SingleAccountHelper.getCurrentSingleSignOnAccount(this) == null) {
                throw new NoCurrentAccountSelectedException();
            }
        } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
            Toast.makeText(this, R.string.no_account_configured_yet, Toast.LENGTH_LONG).show();
            finish();
            return;
        }

        binding = ActivityEditBinding.inflate(getLayoutInflater());
        setContentView(binding.getRoot());
        setSupportActionBar(binding.toolbar);
+1 −0
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@
    <string name="error_action_open_battery_settings">Battery settings</string>
    <string name="error_action_open_deck_info">Open App info</string>
    <string name="error_action_open_network">Network settings</string>
    <string name="no_account_configured_yet">No account configured yet</string>
    <string name="no_other_accounts">You don\'t have configured any other accounts yet.</string>
    <string name="context_based_formatting">Context based formatting popover</string>
</resources>