Use AndroidX-fragment for compatibility reasons (6e45e233) · Commits · e / os / Notes

app/build.gradle

+4 −3

Original line number	Diff line number	Diff line
		@@ -45,13 +45,14 @@ dependencies {
		implementation 'com.jakewharton:butterknife:10.2.1'
		annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'

		implementation "androidx.fragment:fragment:1.1.0"
		implementation "androidx.appcompat:appcompat:1.1.0"
		implementation "androidx.recyclerview:recyclerview:1.1.0"
		implementation "com.google.android.material:material:1.0.0"

		androidTestImplementation 'junit:junit:4.12'
		androidTestImplementation 'com.android.support:support-annotations:24.0.0'
		androidTestImplementation 'com.android.support.test:runner:0.5'
		androidTestImplementation 'junit:junit:4.13'
		androidTestImplementation 'com.android.support:support-annotations:28.0.0'
		androidTestImplementation 'com.android.support.test:runner:1.0.2'

		implementation fileTree(dir: 'libs', include: ['*.jar'])
		}

app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java

+7 −7

Original line number	Diff line number	Diff line
		package it.niedermann.owncloud.notes.android.activity;

		import android.app.Fragment;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.os.Bundle;
		@@ -11,6 +10,7 @@ import android.view.MenuItem;

		import androidx.appcompat.app.ActionBar;
		import androidx.appcompat.app.AppCompatActivity;
		import androidx.fragment.app.Fragment;

		import java.util.Calendar;
		import java.util.Objects;
		@@ -49,7 +49,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
		if (savedInstanceState == null) {
		launchNoteFragment();
		} else {
		fragment = (BaseNoteFragment) getFragmentManager().findFragmentById(android.R.id.content);
		fragment = (BaseNoteFragment) getSupportFragmentManager().findFragmentById(android.R.id.content);
		}
		ActionBar actionBar = getSupportActionBar();
		if (actionBar != null) {
		@@ -63,7 +63,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
		Log.d(TAG, "onNewIntent: " + intent.getLongExtra(PARAM_NOTE_ID, 0));
		setIntent(intent);
		if (fragment != null) {
		getFragmentManager().beginTransaction().detach(fragment).commit();
		getSupportFragmentManager().beginTransaction().detach(fragment).commit();
		fragment = null;
		}
		launchNoteFragment();
		@@ -125,7 +125,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
		// save state of the fragment in order to resume with the same note and originalNote
		Fragment.SavedState savedState = null;
		if (fragment != null) {
		savedState = getFragmentManager().saveFragmentInstanceState(fragment);
		savedState = getSupportFragmentManager().saveFragmentInstanceState(fragment);
		}
		if (edit) {
		fragment = NoteEditFragment.newInstance(accountId, noteId);
		@@ -136,7 +136,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
		if (savedState != null) {
		fragment.setInitialSavedState(savedState);
		}
		getFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
		getSupportFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
		}

		/**
		@@ -165,7 +165,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm

		CloudNote newNote = new CloudNote(0, Calendar.getInstance(), NoteUtil.generateNonEmptyNoteTitle(content, this), content, favorite, category, null);
		fragment = NoteEditFragment.newInstanceWithNewNote(newNote);
		getFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
		getSupportFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();
		}

		@Override

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -970,7 +970,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
		return true;
		}
		case R.id.menu_move: {
		AccountChooserDialogFragment.newInstance().show(getFragmentManager(), NotesListViewActivity.class.getCanonicalName());
		AccountChooserDialogFragment.newInstance().show(getSupportFragmentManager(), NotesListViewActivity.class.getCanonicalName());
		return true;
		}
		}

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/AccountChooserDialogFragment.java

+6 −10

Original line number	Diff line number	Diff line
		package it.niedermann.owncloud.notes.android.fragment;

		import android.app.Activity;
		import android.app.Dialog;
		import android.app.DialogFragment;
		import android.content.Context;
		import android.os.Bundle;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -12,6 +11,7 @@ import android.view.WindowManager;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.appcompat.app.AlertDialog;
		import androidx.fragment.app.DialogFragment;
		import androidx.recyclerview.widget.RecyclerView;

		import java.util.List;
		@@ -35,15 +35,11 @@ public class AccountChooserDialogFragment extends DialogFragment implements Acco
		public AccountChooserDialogFragment() {
		}

		/*
		* This is used instead of onAttach(Context context) for supporting < API 23
		* TODO Switch to androidx for fragments
		*/
		@Override
		public void onAttach(Activity activity) {
		super.onAttach(activity);
		if (activity instanceof AccountChooserListener) {
		this.accountChooserListener = (AccountChooserListener) activity;
		public void onAttach(@NonNull Context context) {
		super.onAttach(context);
		if (context instanceof AccountChooserListener) {
		this.accountChooserListener = (AccountChooserListener) context;
		} else {
		throw new ClassCastException("Caller must implement " + AccountChooserListener.class.getCanonicalName());
		}

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java

+2 −2

Original line number	Diff line number	Diff line
		package it.niedermann.owncloud.notes.android.fragment;

		import android.app.Activity;
		import android.app.Fragment;
		import android.app.FragmentManager;
		import android.app.PendingIntent;
		import android.content.Intent;
		import android.content.SharedPreferences;
		@@ -27,6 +25,8 @@ import androidx.appcompat.widget.SearchView;
		import androidx.appcompat.widget.ShareActionProvider;
		import androidx.core.view.MenuItemCompat;
		import androidx.core.view.ViewCompat;
		import androidx.fragment.app.Fragment;
		import androidx.fragment.app.FragmentManager;

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