提交: master - kigo (git)

はてなハイク・キーワードの検索と入力アプリ

Commit MetaInfo

• 修订版: 3f158e57b63164c375e7fe7f96d7eddc8e65ff5e (tree)
• 时间: 2012-10-30 00:11:01
• 作者: Kodakana <kodakana@linu...>
• Commiter: Kodakana

Log Message

前回の修正によりHoneycomb以上で情報ダイアログが出せなくなっていた手違いの修正。

更改概述

• modified: AndroidManifest.xml
• modified: bin/AndroidManifest.xml
• modified: bin/Kigo.apk
• modified: bin/classes.dex
• delete: bin/classes/org/pulpdust/kigo/KigoActivity$7$1.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity$7.class
• modified: bin/classes/org/pulpdust/kigo/KigoActivity.class
• modified: bin/resources.ap_
• modified: res/values-ja/strings.xml
• modified: res/values/strings.xml
• modified: src/org/pulpdust/kigo/KigoActivity.java

差异

--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.kigo"
-    android:versionCode="4"
-    android:versionName="0.55"
+    android:versionCode="5"
+    android:versionName="0.56"
     android:installLocation="auto" >
 
     <uses-sdk

--- a/bin/AndroidManifest.xml
+++ b/bin/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.pulpdust.kigo"
-    android:versionCode="4"
-    android:versionName="0.55"
+    android:versionCode="5"
+    android:versionName="0.56"
     android:installLocation="auto" >
 
     <uses-sdk

Binary files a/bin/Kigo.apk and b/bin/Kigo.apk differ

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

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$7$1.class and /dev/null differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity$7.class and b/bin/classes/org/pulpdust/kigo/KigoActivity$7.class differ

Binary files a/bin/classes/org/pulpdust/kigo/KigoActivity.class and b/bin/classes/org/pulpdust/kigo/KigoActivity.class differ

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

--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <string name="app_name">Kigo</string>
-    <string name="app_ver">0.55</string>
+    <string name="app_ver">0.56</string>
     <string name="app_lic">GNU GPL v3</string>
     <string name="address">連絡先</string>
     <string name="app_author">Kodakana&lt;[e-mail]&gt;</string>

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <string name="app_name">Kigo</string>
-    <string name="app_ver">0.55</string>
+    <string name="app_ver">0.56</string>
     <string name="app_lic">GNU GPL v3</string>
     <string name="address">Address</string>
     <string name="app_author">Kodakana&lt;[e-mail]&gt;</string>

--- a/src/org/pulpdust/kigo/KigoActivity.java
+++ b/src/org/pulpdust/kigo/KigoActivity.java
@@ -338,65 +338,80 @@ public class KigoActivity extends FragmentActivity {
     		return echoInfo(cx, getActivity(), getArguments().getString("word"));
     	}
     }
-    public static AlertDialog echoInfo(Context context, FragmentActivity av, String word){
+    public static class Share {
+    	static String xml;
+    }
+    public static AlertDialog echoInfo(final Context context, final FragmentActivity av, final String word){
 //    	final Handler handler = new Handler();
+    	boolean isc = isConnect(context);
     	AlertDialog ad = null;
+    	Share.xml = null;
 //		final Context context = this;
-//    	new Thread(new Runnable(){
-//    		@Override
-//    		public void run(){
+    	Thread th = new Thread(new Runnable(){
+    		@Override
+    		public void run(){
 		    	try {
 		    		String turi = host + ipth + URLEncoder.encode(word, "UTF-8").replace("+", "%20");
-			    	final String xml = getHttp(context, turi);
-//	    			handler.post(new Runnable(){
-//	    				@Override
-//	    				public void run(){
-	    				    	if (xml != null){
-	    				    		String info[] = exInfo(xml);
-	    				    		if(info != null){
-	    					    		AlertDialog.Builder abuilder = new AlertDialog.Builder(context);
-	    					    		LayoutInflater linflater = 
-	    					    				(LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
-	    					    		View layout = linflater.inflate(R.layout.info,
-	    					    				(ViewGroup) av.findViewById(R.id.layout_root));
-	    					    		TextView tv1 = (TextView) layout.findViewById(R.id.textView1);
-	    					    		TextView tv2 = (TextView) layout.findViewById(R.id.textView2);
-	    					    		TextView tv3 = (TextView) layout.findViewById(R.id.textView3);
-//	    					    		TextView tv4 = (TextView) layout.findViewById(R.id.textView4);
-	    					    		tv1.setText(av.getString(R.string.info_entries) + info[0]);
-	    					    		tv2.setText(av.getString(R.string.info_follows) + info[1]);
-	    					    		tv3.setText(av.getString(R.string.info_title) + info[2]);
-//	    					    		tv4.setText(getString(R.string.info_word) + info[3]);
-	    				    			abuilder.setTitle(word);
-	    				    			abuilder.setCancelable(true);
-	    				    			abuilder.setView(layout);
-	    				    			ad = abuilder.create();
-	    				    		}
-	    				    	} else {
-	    				    		AlertDialog.Builder empty = new AlertDialog.Builder(context);
-    					    		LayoutInflater linflater = 
-    					    				(LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
-    					    		View layout = linflater.inflate(R.layout.info,
-    					    				(ViewGroup) av.findViewById(R.id.layout_root));
-    					    		TextView tv1 = (TextView) layout.findViewById(R.id.textView1);
-    					    		tv1.setText(R.string.err_fail_get);
-    				    			empty.setTitle(word);
-    				    			empty.setCancelable(true);
-    				    			empty.setView(layout);
-	    				    		ad = empty.create();
-//	    				    		Toast.makeText(context, R.string.err_fail_get, 
-//	    			              			Toast.LENGTH_SHORT).show();
-	    				    	}
-//	    				}
-//	    			});
+			    	Share.xml = getHttp(context, turi);
 
 				} catch (UnsupportedEncodingException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-    			return ad;
-//    		}
-//    	}).start();
+    		}
+    	});
+    	if (isc){
+    		th.start();
+    		try {
+    			th.join();
+    		} catch (InterruptedException e) {
+    			// TODO Auto-generated catch block
+    			e.printStackTrace();
+    		}
+//		handler.post(new Runnable(){
+//			@Override
+//			public void run(){
+			    	if (Share.xml != null){
+			    		String info[] = exInfo(Share.xml);
+			    		if(info != null){
+				    		AlertDialog.Builder abuilder = new AlertDialog.Builder(context);
+				    		LayoutInflater linflater = 
+				    				(LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
+				    		View layout = linflater.inflate(R.layout.info,
+				    				(ViewGroup) av.findViewById(R.id.layout_root));
+				    		TextView tv1 = (TextView) layout.findViewById(R.id.textView1);
+				    		TextView tv2 = (TextView) layout.findViewById(R.id.textView2);
+				    		TextView tv3 = (TextView) layout.findViewById(R.id.textView3);
+//				    		TextView tv4 = (TextView) layout.findViewById(R.id.textView4);
+				    		tv1.setText(av.getString(R.string.info_entries) + info[0]);
+				    		tv2.setText(av.getString(R.string.info_follows) + info[1]);
+				    		tv3.setText(av.getString(R.string.info_title) + info[2]);
+//				    		tv4.setText(getString(R.string.info_word) + info[3]);
+			    			abuilder.setTitle(word);
+			    			abuilder.setCancelable(true);
+			    			abuilder.setView(layout);
+			    			ad = abuilder.create();
+			    		}
+			    	}
+    	}
+			    	if (ad == null) {
+			    		AlertDialog.Builder empty = new AlertDialog.Builder(context);
+			    		LayoutInflater linflater = 
+			    				(LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
+			    		View layout = linflater.inflate(R.layout.info,
+			    				(ViewGroup) av.findViewById(R.id.layout_root));
+			    		TextView tv1 = (TextView) layout.findViewById(R.id.textView1);
+			    		tv1.setText(R.string.err_fail_get);
+		    			empty.setTitle(word);
+		    			empty.setCancelable(true);
+		    			empty.setView(layout);
+			    		ad = empty.create();
+//			    		Toast.makeText(context, R.string.err_fail_get, 
+//		              			Toast.LENGTH_SHORT).show();
+			    	}
+//			}
+//		});
+		return ad;
     }
     
 //    @Override