tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some many bugs

Browse Source
This commit is contained in:
hyb1996
2018-02-04 16:18:05 +08:00
parent 2e1f09061c
commit 204acdaf82
8 changed files with 83 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/stardust/scriptdroid/model/autocomplete/AutoCompletion.java
View File

@@ -7,6 +7,7 @@ import com.stardust.scriptdroid.model.indices.Modules;
import com.stardust.scriptdroid.model.indices.Property;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -120,6 +121,8 @@ public class AutoCompletion {
}
private List<CodeCompletion> findCodeCompletionForGlobal(String propertyPrefill) {
if (propertyPrefill == null)
return Collections.emptyList();
List<DictionaryTree.Entry<Property>> result = mGlobalPropertyTree.searchByPrefill(propertyPrefill);
List<CodeCompletion> completions = new ArrayList<>();
for (DictionaryTree.Entry<Property> entry : result) {

1
app/src/main/java/com/stardust/scriptdroid/network/download/DownloadManager.java
View File

@@ -9,6 +9,7 @@ import com.stardust.scriptdroid.network.api.DownloadApi;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.SocketTimeoutException;
import java.net.URLDecoder;
import java.util.concurrent.ConcurrentHashMap;

3
app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java
View File

@@ -214,7 +214,8 @@ public class CircularMenu implements Recorder.OnStateChangedListener, LayoutInsp
@Override
public void onCaptureAvailable(NodeInfo capture) {
mCaptureDeferred.resolve(capture);
if (mCaptureDeferred != null && mCaptureDeferred.isPending())
mCaptureDeferred.resolve(capture);
}
private boolean ensureCapture() {

7
app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java
View File

@@ -50,6 +50,13 @@ public class FloatyWindowManger {
return sCircularMenu != null && sCircularMenu.get() != null;
}
public static void showCircularMenuIfNeeded() {
if (isCircularMenuShowing()) {
return;
}
showCircularMenu();
}
public static boolean showCircularMenu() {
if (!SettingsCompat.canDrawOverlays(App.getApp())) {
Toast.makeText(App.getApp(), R.string.text_no_floating_window_permission, Toast.LENGTH_SHORT).show();

22
app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java
View File

@@ -131,7 +131,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
ThemeColorManager.addViewBackground(mHeaderView);
initMenuItems();
if (Pref.isFloatingMenuShown()) {
FloatyWindowManger.showCircularMenu();
FloatyWindowManger.showCircularMenuIfNeeded();
setChecked(mFloatingWindowItem, true);
}
setChecked(mConnectionItem, DevPluginService.getInstance().isConnected());
@@ -164,12 +164,20 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
.me()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe((user ->
WebActivity_.intent(this)
.extra(WebActivity.EXTRA_URL, NodeBB.url("user/" + user.getUserslug()))
.extra(Intent.EXTRA_TITLE, user.getUsername())
.start()),
error -> LoginActivity_.intent(getActivity()).start());
.subscribe(user -> {
if (getActivity() == null)
return;
WebActivity_.intent(this)
.extra(WebActivity.EXTRA_URL, NodeBB.url("user/" + user.getUserslug()))
.extra(Intent.EXTRA_TITLE, user.getUsername())
.start();
},
error -> {
if (getActivity() == null)
return;
LoginActivity_.intent(getActivity()).start();
}
);
}

2
app/src/main/java/com/stardust/scriptdroid/ui/main/scripts/MyScriptListFragment.java
View File

@@ -163,6 +163,8 @@ public class MyScriptListFragment extends ViewPagerFragment implements BackPress
@Override
public void onClick(FloatingActionButton button, int pos) {
if (mScriptFileList == null)
return;
switch (pos) {
case 0:
new ScriptOperations(getContext(), mScriptFileList, mScriptFileList.getCurrentDirectory())