Skip to content

Commit 8791a15

Browse files
committed
clean
1 parent 25e1792 commit 8791a15

File tree

1 file changed

+1
-47
lines changed

1 file changed

+1
-47
lines changed

app/src/main/java/com/jecelyin/editor/v2/ui/activities/EditorActivity.java

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
package com.jecelyin.editor.v2.ui.activities;
1818

19-
import android.Manifest;
2019
import android.content.Intent;
2120
import android.content.SharedPreferences;
2221
import android.content.pm.ActivityInfo;
23-
import android.content.pm.PackageManager;
2422
import android.content.res.Resources;
2523
import android.graphics.Color;
2624
import android.graphics.drawable.Drawable;
@@ -30,7 +28,6 @@
3028
import android.support.annotation.IdRes;
3129
import android.support.annotation.NonNull;
3230
import android.support.annotation.Nullable;
33-
import android.support.v4.app.ActivityCompat;
3431
import android.support.v4.view.GravityCompat;
3532
import android.support.v4.view.ViewPager;
3633
import android.support.v4.widget.DrawerLayout;
@@ -115,13 +112,6 @@ public class EditorActivity extends FullScreenActivity
115112
private FolderChooserDialog.FolderCallback findFolderCallback;
116113
private long mExitTime;
117114

118-
public static Intent getOpenFileIntent(File file, int offset) {
119-
Intent intent = new Intent();
120-
intent.putExtra("file", file.getPath());
121-
intent.putExtra("offset", offset);
122-
return intent;
123-
}
124-
125115
@Override
126116
protected void onRestoreInstanceState(Bundle savedInstanceState) {
127117
try {
@@ -136,41 +126,6 @@ public void onSaveInstanceState(Bundle outState, PersistableBundle outPersistent
136126
super.onSaveInstanceState(outState, outPersistentState);
137127
}
138128

139-
private void requestWriteExternalStoragePermission() {
140-
final String[] permissions = new String[]{
141-
Manifest.permission.READ_EXTERNAL_STORAGE
142-
, Manifest.permission.WRITE_EXTERNAL_STORAGE
143-
};
144-
if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
145-
UIUtils.showConfirmDialog(this, null, getString(R.string.need_to_enable_read_storage_permissions), new UIUtils.OnClickCallback() {
146-
@Override
147-
public void onOkClick() {
148-
ActivityCompat.requestPermissions(EditorActivity.this, permissions, RC_PERMISSION_STORAGE);
149-
}
150-
151-
@Override
152-
public void onCancelClick() {
153-
finish();
154-
}
155-
});
156-
} else {
157-
ActivityCompat.requestPermissions(EditorActivity.this, permissions, RC_PERMISSION_STORAGE);
158-
}
159-
}
160-
161-
@Override
162-
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
163-
// Write external store permission requires a restart
164-
for (int i = 0; i < permissions.length; i++) {
165-
//Manifest.permission.WRITE_EXTERNAL_STORAGE.equals(permissions[i])
166-
if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
167-
requestWriteExternalStoragePermission();
168-
return;
169-
}
170-
}
171-
start();
172-
}
173-
174129
@Override
175130
protected void onCreate(Bundle savedInstanceState) {
176131
super.onCreate(savedInstanceState);
@@ -263,6 +218,7 @@ private void setScreenOrientation() {
263218
private void start() {
264219
mEditorPager.setVisibility(View.VISIBLE);
265220
initUI();
221+
processIntent();
266222
}
267223

268224
private void initUI() {
@@ -275,8 +231,6 @@ private void initUI() {
275231
if (mMenuManager == null) {
276232
mMenuManager = new MenuManager(this);
277233
}
278-
279-
processIntent();
280234
}
281235

282236
private void initToolbar() {

0 commit comments

Comments
 (0)