Commit: 438ca7d671f33b25f596b3848167d7147a104f1f - Unnet_Browser (git)

Offline HTML Reader for Android

Commit MetaInfo

• Revision: 438ca7d671f33b25f596b3848167d7147a104f1f (tree)
• Zeit: 2014-12-30 19:07:41
• Autor: Kana Koda <kodakana@user...>
• Commiter: Kana Koda

Log Message

KitKat で外部ストレージのファイルを開けない問題の修正。

Ändern Zusammenfassung

• modified: .classpath
• modified: AndroidManifest.xml
• modified: bin/AndroidManifest.xml
• modified: bin/Unnet Browser.apk
• modified: bin/classes.dex
• modified: bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$10.class
• modified: bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$11.class
• modified: bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$12.class
• modified: bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$13.class
• modified: bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity.class
• modified: bin/jarlist.cache
• add: bin/res/crunch/drawable-hdpi/ic_launcher.png
• add: bin/res/crunch/drawable-ldpi/ic_launcher.png
• add: bin/res/crunch/drawable-mdpi/ic_launcher.png
• add: bin/res/crunch/drawable-xhdpi/ic_launcher.png
• modified: bin/resources.ap_
• modified: project.properties
• modified: res/values-ja/strings.xml
• modified: res/values/strings.xml
• modified: src/org/pulpdust/unnetbrowser/UnnetBrowserActivity.java

Diff

--- a/.classpath
+++ b/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.unnetbrowser"
-    android:versionCode="5"
-    android:versionName="0.82"
+    android:versionCode="7"
+    android:versionName="0.85"
     android:installLocation="auto" >
 
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:icon="@drawable/ic_launcher"

--- a/bin/AndroidManifest.xml
+++ b/bin/AndroidManifest.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.unnetbrowser"
-    android:versionCode="5"
-    android:versionName="0.82"
+    android:versionCode="7"
+    android:versionName="0.85"
     android:installLocation="auto" >
 
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="14" />
+    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:icon="@drawable/ic_launcher"

Binary files a/bin/Unnet Browser.apk and b/bin/Unnet Browser.apk differ

Binary files a/bin/classes.dex and b/bin/classes.dex differ

Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$10.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$10.class differ

Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$11.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$11.class differ

Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$12.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$12.class differ

Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$13.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity$13.class differ

Binary files a/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity.class and b/bin/classes/org/pulpdust/unnetbrowser/UnnetBrowserActivity.class differ

--- a/bin/jarlist.cache
+++ b/bin/jarlist.cache
@@ -1,3 +1,3 @@
-# cache for current jar dependecy. DO NOT EDIT.
+# cache for current jar dependency. DO NOT EDIT.
 # format is <lastModified> <length> <SHA-1> <path>
 # Encoding is UTF-8

Binary files /dev/null and b/bin/res/crunch/drawable-hdpi/ic_launcher.png differ

Binary files /dev/null and b/bin/res/crunch/drawable-ldpi/ic_launcher.png differ

Binary files /dev/null and b/bin/res/crunch/drawable-mdpi/ic_launcher.png differ

Binary files /dev/null and b/bin/res/crunch/drawable-xhdpi/ic_launcher.png differ

Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ

--- a/project.properties
+++ b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-14
+target=android-19

--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -5,11 +5,11 @@
     <string name="app_name">Unnet Browser</string>
     <string name="app_desc">オフライン HTML リーダ</string>
     <string name="version">バージョン</string>
-    <string name="app_ver">0.8</string>
+    <string name="app_ver">0.85</string>
     <string name="address">連絡先</string>
     <string name="app_author">Kodakana&lt;[e-mail]&gt;</string>
     <string name="copy">製作・著作</string>
-    <string name="app_copy">&#169; 2012 Kodakana &lt;[e-mail]&gt;</string>
+    <string name="app_copy">&#169; 2014 Kodakana &lt;[e-mail]&gt;</string>
     <string name="license">許諾条件</string>
     <string name="app_lic">GNU GPL v3</string>
     <string name="open">開く&#8230;</string>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,11 +5,11 @@
     <string name="app_name">Unnet Browser</string>
     <string name="app_desc">is an offline HTML reader.</string>
     <string name="version">Version</string>
-    <string name="app_ver">0.8</string>
+    <string name="app_ver">0.85</string>
     <string name="address">Address</string>
     <string name="app_author">Kodakana &lt;[e-mail]&gt;</string>
     <string name="copy">Copyright</string>
-    <string name="app_copy">&#169; 2012 Kodakana &lt;[e-mail]&gt;</string>
+    <string name="app_copy">&#169; 2014 Kodakana &lt;[e-mail]&gt;</string>
     <string name="license">License</string>
     <string name="app_lic">GNU GPL v3</string>
     <string name="open">Open&#8230;</string>

--- a/src/org/pulpdust/unnetbrowser/UnnetBrowserActivity.java
+++ b/src/org/pulpdust/unnetbrowser/UnnetBrowserActivity.java
@@ -952,46 +952,27 @@ public class UnnetBrowserActivity extends FragmentActivity {
 //    }
     public void textFind(String subject){
     	fsbj = subject;
-    	textview1.setVisibility(View.VISIBLE);
+    	if (Build.VERSION.SDK_INT < 16) textview1.setVisibility(View.VISIBLE);
     	if (matchs == -1){
     		webview.clearMatches();
     	matchs = webview.findAll(subject);
-//    	webview.findNext(true);
-//    	match++;
     	} else {}
     	if (match == 0){
-//    		webview.findNext(false);
     		match++;
     	}
     	else if (matchs > match){
-//       webview.findAll(subject);
     	webview.findNext(true);
     	match++;
     	} else {}
     	if (matchs > 0){
-    		textview1.setText(getString(R.string.match)+" "+String.valueOf(match)+"/"+String.valueOf(matchs));
-//    		Toast tst = Toast.makeText(this,
-//    			getString(R.string.match)+" "+String.valueOf(match)+"/"+String.valueOf(matchs),
-//    			Toast.LENGTH_SHORT);
-//    		tst.setGravity(Gravity.BOTTOM, 0, 0);
-//    		tst.cancel();
-//    		tst.show();
+    		if (Build.VERSION.SDK_INT < 16) textview1.setText(getString(R.string.match)+" "+String.valueOf(match)+"/"+String.valueOf(matchs));
     	} else {
-    		textview1.setText(getString(R.string.match)+" "+String.valueOf(matchs));
-//    		Toast tst = Toast.makeText(this,
-//        			getString(R.string.match)+" "+String.valueOf(matchs),
-//        			Toast.LENGTH_SHORT);
-//        	tst.setGravity(Gravity.BOTTOM, 0, 0);
-//        	tst.cancel();
-//        	tst.show();
+    		if (Build.VERSION.SDK_INT < 16) textview1.setText(getString(R.string.match)+" "+String.valueOf(matchs));
         	match = 0;
     	}
     	if (matchs == match){
     		matchs = -1;
     		match = 0;
-//        	matchs = webview.findAll(subject);
-//        	webview.findNext(true);
-//        	match++;
     	}
     }
     public void shiftDown(){
@@ -1312,7 +1293,7 @@ public class UnnetBrowserActivity extends FragmentActivity {
         wbsttngs.setSavePassword(false);
         wbsttngs.setLightTouchEnabled(true);
         wbsttngs.setSupportZoom(true);
-        wbsttngs.setPluginsEnabled(true);
+//        wbsttngs.setPluginsEnabled(true);
         wbsttngs.setBuiltInZoomControls(shrdprfs.getBoolean("show_zoom", true));
         wbsttngs.setDefaultFontSize(Integer.parseInt(shrdprfs.getString("font_size", "16")));
         wbsttngs.setJavaScriptEnabled(shrdprfs.getBoolean("en_script", false));