Use new nextcloud-commons library for SSO Glide integration (e87ddac3) · Commits · e / os / Notes

app/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ android {

		dependencies {
		implementation "com.github.nextcloud:Android-SingleSignOn:0.5.0-rc2"
		implementation 'com.github.stefan-niedermann:nextcloud-commons:6250e5fe73'
		implementation 'com.github.stefan-niedermann:nextcloud-commons:0.0.1'

		implementation 'com.yydcdut:markdown-processor:0.1.3'
		implementation 'com.yydcdut:rxmarkdown-wrapper:0.1.3'

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,11 +14,11 @@ import com.google.android.material.tabs.TabLayout;

		import butterknife.BindView;
		import butterknife.ButterKnife;
		import it.niedermann.nextcloud.exception.ExceptionHandler;
		import it.niedermann.owncloud.notes.R;
		import it.niedermann.owncloud.notes.android.fragment.about.AboutFragmentContributingTab;
		import it.niedermann.owncloud.notes.android.fragment.about.AboutFragmentCreditsTab;
		import it.niedermann.owncloud.notes.android.fragment.about.AboutFragmentLicenseTab;
		import it.niedermann.owncloud.notes.util.ExceptionHandler;

		public class AboutActivity extends AppCompatActivity {

		@@ -32,7 +32,7 @@ public class AboutActivity extends AppCompatActivity {
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
		Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this, ExceptionActivity.class));
		setContentView(R.layout.activity_about);
		ButterKnife.bind(this);

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import java.util.Objects;

		import butterknife.BindView;
		import butterknife.ButterKnife;
		import it.niedermann.nextcloud.exception.ExceptionHandler;
		import it.niedermann.owncloud.notes.R;
		import it.niedermann.owncloud.notes.android.fragment.BaseNoteFragment;
		import it.niedermann.owncloud.notes.android.fragment.NoteEditFragment;
		@@ -30,7 +31,6 @@ import it.niedermann.owncloud.notes.model.Category;
		import it.niedermann.owncloud.notes.model.CloudNote;
		import it.niedermann.owncloud.notes.model.DBNote;
		import it.niedermann.owncloud.notes.model.LocalAccount;
		import it.niedermann.owncloud.notes.util.ExceptionHandler;
		import it.niedermann.owncloud.notes.util.NoteUtil;

		import static it.niedermann.owncloud.notes.android.fragment.AccountChooserAdapter.AccountChooserListener;
		@@ -55,7 +55,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
		@Override
		protected void onCreate(final Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
		Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this, ExceptionActivity.class));

		setContentView(R.layout.activity_edit);

+3 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,10 @@ import androidx.appcompat.widget.Toolbar;
		import butterknife.BindView;
		import butterknife.ButterKnife;
		import butterknife.OnClick;
		import it.niedermann.nextcloud.exception.ExceptionUtil;
		import it.niedermann.owncloud.notes.R;
		import it.niedermann.owncloud.notes.util.ExceptionUtil;

		import static it.niedermann.nextcloud.exception.ExceptionHandler.KEY_THROWABLE;

		public class ExceptionActivity extends AppCompatActivity {

		@@ -28,8 +30,6 @@ public class ExceptionActivity extends AppCompatActivity {
		@BindView(R.id.stacktrace)
		TextView stacktrace;

		public static final String KEY_THROWABLE = "T";

		@SuppressLint("SetTextI18n") // only used for logging
		@Override
		protected void onCreate(@Nullable Bundle savedInstanceState) {
		@@ -38,7 +38,6 @@ public class ExceptionActivity extends AppCompatActivity {
		super.onCreate(savedInstanceState);
		setSupportActionBar(toolbar);
		throwable = ((Throwable) getIntent().getSerializableExtra(KEY_THROWABLE));
		throwable.printStackTrace();
		toolbar.setTitle(getString(R.string.simple_error));
		this.message.setText(throwable.getMessage());
		this.stacktrace.setText(ExceptionUtil.getDebugInfos(this, throwable));

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import java.util.Map;

		import butterknife.BindView;
		import butterknife.ButterKnife;
		import it.niedermann.nextcloud.exception.ExceptionHandler;
		import it.niedermann.owncloud.notes.R;
		import it.niedermann.owncloud.notes.android.MultiSelectedActionModeCallback;
		import it.niedermann.owncloud.notes.android.NotesListViewItemTouchHelper;
		@@ -68,7 +69,6 @@ import it.niedermann.owncloud.notes.persistence.LoadNotesListTask;
		import it.niedermann.owncloud.notes.persistence.LoadNotesListTask.NotesLoadedListener;
		import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
		import it.niedermann.owncloud.notes.persistence.NoteServerSyncHelper;
		import it.niedermann.owncloud.notes.util.ExceptionHandler;
		import it.niedermann.owncloud.notes.util.NoteUtil;

		import static it.niedermann.owncloud.notes.util.SSOUtil.askForNewAccount;
		@@ -155,7 +155,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this));
		Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this, ExceptionActivity.class));

		setContentView(R.layout.drawer_layout);
		ButterKnife.bind(this);