Skip to content

Commit b7571d0

Browse files
committed
ShareInto: Fix crash getRecentFiles() on nullptr, closes #2672, by @gsantner
1 parent 11ad09c commit b7571d0

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

app/src/main/java/net/gsantner/opoc/frontend/base/GsActivityBase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
1313

14-
import android.content.Context;
1514
import android.os.Bundle;
1615
import android.os.Handler;
1716
import android.view.View;

app/src/main/java/net/gsantner/opoc/frontend/base/GsPreferenceFragmentBase.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,17 @@ public String getTitle() {
145145
protected int _defaultIconTintColor;
146146
protected GsContextUtils _cu;
147147

148+
@Override
149+
public void onAttach(@NonNull Context context) {
150+
super.onAttach(context);
151+
_appSettings = getAppSettings(context);
152+
_cu = GsContextUtils.instance;
153+
}
154+
148155
@Override
149156
@Deprecated
150157
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
151158
Activity activity = getActivity();
152-
_appSettings = getAppSettings(activity);
153-
_cu = GsContextUtils.instance;
154159
getPreferenceManager().setSharedPreferencesName(getSharedPreferencesName());
155160
addPreferencesFromResource(getPreferenceResourceForInflation());
156161

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import androidx.recyclerview.widget.RecyclerView;
3939
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
4040

41-
import net.gsantner.markor.ApplicationObject;
4241
import net.gsantner.markor.R;
4342
import net.gsantner.markor.format.FormatRegistry;
4443
import net.gsantner.markor.frontend.FileInfoDialog;

app/src/main/java/net/gsantner/opoc/model/GsSharedPreferencesPropertyBackend.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@ public boolean isAppCurrentVersionFirstStart(boolean doSet) {
3535
import android.annotation.SuppressLint;
3636
import android.content.Context;
3737
import android.content.SharedPreferences;
38-
import android.os.Build;
3938
import android.text.TextUtils;
4039

4140
import androidx.annotation.ColorRes;
4241
import androidx.annotation.NonNull;
4342
import androidx.annotation.StringRes;
44-
import androidx.core.content.ContextCompat;
4543

4644
import java.io.File;
4745
import java.util.ArrayList;

app/src/main/java/net/gsantner/opoc/util/GsContextUtils.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import android.net.Uri;
5959
import android.os.Build;
6060
import android.os.Environment;
61-
import android.os.IBinder;
6261
import android.os.ParcelFileDescriptor;
6362
import android.os.SystemClock;
6463
import android.os.VibrationEffect;
@@ -90,10 +89,7 @@
9089
import android.view.View;
9190
import android.view.ViewGroup;
9291
import android.view.Window;
93-
import android.view.WindowInsets;
94-
import android.view.WindowInsetsController;
9592
import android.view.WindowManager;
96-
import android.view.inputmethod.InputMethodManager;
9793
import android.webkit.MimeTypeMap;
9894
import android.webkit.WebView;
9995
import android.widget.ImageView;

0 commit comments

Comments
 (0)