mirror of
https://github.com/nextcloud/notes-android.git
synced 2024-10-25 22:26:00 +03:00
fix loading notes from widget
This commit is contained in:
parent
62d15b4fd7
commit
e68dbe1e6d
3 changed files with 7 additions and 6 deletions
|
@ -44,6 +44,10 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
|
||||||
super.onNewIntent(intent);
|
super.onNewIntent(intent);
|
||||||
Log.d(getClass().getSimpleName(), "onNewIntent: "+intent.getLongExtra(PARAM_NOTE_ID, 0));
|
Log.d(getClass().getSimpleName(), "onNewIntent: "+intent.getLongExtra(PARAM_NOTE_ID, 0));
|
||||||
setIntent(intent);
|
setIntent(intent);
|
||||||
|
if(fragment != null) {
|
||||||
|
getFragmentManager().beginTransaction().detach(fragment).commit();
|
||||||
|
fragment = null;
|
||||||
|
}
|
||||||
createFragmentByPreference();
|
createFragmentByPreference();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,7 @@ public class NoteEditFragment extends BaseNoteFragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
private RxMDEditText getContentView() {
|
private RxMDEditText getContentView() {
|
||||||
return (RxMDEditText) getActivity().findViewById(R.id.editContent);
|
return (RxMDEditText) getView().findViewById(R.id.editContent);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -8,7 +8,6 @@ import android.view.LayoutInflater;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.view.WindowManager;
|
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import com.yydcdut.rxmarkdown.RxMDTextView;
|
import com.yydcdut.rxmarkdown.RxMDTextView;
|
||||||
|
@ -48,9 +47,7 @@ public class NotePreviewFragment extends BaseNoteFragment {
|
||||||
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
|
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
|
||||||
super.onActivityCreated(savedInstanceState);
|
super.onActivityCreated(savedInstanceState);
|
||||||
|
|
||||||
getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
|
final RxMDTextView noteContent = getView().findViewById(R.id.single_note_content);
|
||||||
|
|
||||||
final RxMDTextView noteContent = getActivity().findViewById(R.id.single_note_content);
|
|
||||||
|
|
||||||
String content = note.getContent();
|
String content = note.getContent();
|
||||||
/*
|
/*
|
||||||
|
@ -89,7 +86,7 @@ public class NotePreviewFragment extends BaseNoteFragment {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
noteContent.setText(content);
|
noteContent.setText(content);
|
||||||
((TextView) getActivity().findViewById(R.id.single_note_content)).setMovementMethod(LinkMovementMethod.getInstance());
|
noteContent.setMovementMethod(LinkMovementMethod.getInstance());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in a new issue