diff --git a/app.apk b/app.apk index 65f51fe..eeccdb5 100644 Binary files a/app.apk and b/app.apk differ diff --git a/main/java/com/hty/browser/FavoriteActivity.java b/main/java/com/hty/browser/FavoriteActivity.java index dd9fd4b..e48c1cc 100644 --- a/main/java/com/hty/browser/FavoriteActivity.java +++ b/main/java/com/hty/browser/FavoriteActivity.java @@ -12,6 +12,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.graphics.Color; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -212,11 +213,17 @@ public class FavoriteActivity extends Activity { case 2: File file = new File(DBHelper.DATABASE_NAME); if (file.exists()) { - Intent intent = new Intent(); - intent.setAction(Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file)); - intent.setType("*/*"); - startActivity(Intent.createChooser(intent, "分享 " + DBHelper.filename)); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { + Intent intent = new Intent(); + intent.setAction(Intent.ACTION_SEND); + Uri uri = Uri.fromFile(file); + //Uri uri = FileProvider.getUriForFile(); //API>=26, FileUriExposedException + intent.putExtra(Intent.EXTRA_STREAM, uri); + intent.setType("*/*"); + startActivity(Intent.createChooser(intent, "分享 " + DBHelper.filename)); + } else { + Toast.makeText(getApplicationContext(), "不支持", Toast.LENGTH_SHORT).show(); + } } else { Toast.makeText(getApplicationContext(), "数据库文件不存在", Toast.LENGTH_SHORT).show(); } diff --git a/main/java/com/hty/browser/MainActivity.java b/main/java/com/hty/browser/MainActivity.java index b0cf038..ae1d522 100644 --- a/main/java/com/hty/browser/MainActivity.java +++ b/main/java/com/hty/browser/MainActivity.java @@ -412,7 +412,7 @@ public class MainActivity extends Activity { WebView w = (WebView) v; HitTestResult result = w.getHitTestResult(); HTRE = result.getExtra(); - Log.e(Thread.currentThread().getStackTrace()[2] + " ", HTRE + ""); + Toast.makeText(getApplicationContext(), result.toString(), Toast.LENGTH_SHORT).show(); menu.setHeaderTitle(HTRE); if (result.getType() == HitTestResult.IMAGE_TYPE || result.getType() == HitTestResult.SRC_IMAGE_ANCHOR_TYPE) { menu.setHeaderIcon(android.R.drawable.ic_menu_gallery); @@ -849,7 +849,7 @@ public class MainActivity extends Activity { case 5: intent = new Intent(); intent.setAction(Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_TEXT, list_webView.get(currentPage).getUrl()); + intent.putExtra(Intent.EXTRA_TEXT, list_webView.get(currentPage).getTitle() + "\n" + list_webView.get(currentPage).getUrl()); intent.setType("text/plain"); startActivity(Intent.createChooser(intent, "分享")); break; @@ -996,8 +996,9 @@ public class MainActivity extends Activity { WebSettings webSettings = webView.getSettings(); webSettings.setJavaScriptEnabled(true); webSettings.setDomStorageEnabled(true); + webView.setWebViewClient(new WebViewClient()); webView.loadUrl("file:///android_asset/home.htm"); - js = "javascript:window.onload=function(){var json=JSON.parse(localStorage.webfav);for(var i=0;i