2.20rel オンラインマニュアルを追加。WebViewのSSLエラーを無視できるようにした。

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="jp.juggler.ImgurMush"
-      android:versionCode="39"
-      android:versionName="2.19"
+      android:versionCode="40"
+      android:versionName="2.20"
       android:installLocation="auto"
 >
 	<uses-sdk

changes.txt

@@ -1,8 +1,12 @@
 
 * バージョン履歴
 
+** 2.20
+- ついでにWebViewのSSLエラーも対策した。IS01でアカウント認証が通るようになったよ
+
 ** 2.19
-アルバム作成ダイアログやリサイズ指定ダイアログの整形
+- アルバム作成ダイアログやリサイズ指定ダイアログの整形
+- ImgurのSSL証明書まわりの変更が org.apache.http や WebView と相性が悪かったので、SSL証明書を検証しないオプションを追加。ああ気持ち悪い
 
 ** 2.18
 新規作成時に空白を含むパラメータを入力するとoAuthの署名が食い違う不具合を修正。

lint.xml

@@ -4,7 +4,7 @@
     <issue id="ButtonCase" severity="ignore" />
     <issue id="ButtonOrder" severity="ignore" />
     <issue id="ContentDescription" severity="ignore" />
-    <issue id="ExportedActivity" severity="informational" />
+    <issue id="ExportedActivity" severity="ignore" />
     <issue id="ExportedContentProvider" severity="informational" />
     <issue id="ExportedReceiver" severity="informational" />
     <issue id="ExportedService" severity="informational" />

proguard.cfg

@@ -1,35 +1,43 @@
--optimizationpasses 5
+# This is a configuration file for ProGuard.
+# http://proguard.sourceforge.net/index.html#manual/usage.html
+
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
--dontpreverify
 -verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
+
+# Optimization is turned off by default. Dex does not like code run
+# through the ProGuard optimize and preverify steps (and performs some
+# of these optimizations on its own).
+-dontoptimize
+-dontpreverify
+# Note that if you want to enable optimization, you cannot just
+# include optimization flags in your own project configuration file;
+# instead you will need to point to the
+# "proguard-android-optimize.txt" file instead of this one from your
+# project.properties file.
+
+-keepattributes *Annotation*
+-keep public class com.google.vending.licensing.ILicensingService
 -keep public class com.android.vending.licensing.ILicensingService
 
+# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native
 -keepclasseswithmembernames class * {
     native <methods>;
 }
 
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
+# keep setters in Views so that animations can still work.
+# see http://proguard.sourceforge.net/manual/examples.html#beans
+-keepclassmembers public class * extends android.view.View {
+   void set*(***);
+   *** get*();
 }
 
+# We want to keep methods in Activity that could be used in the XML attribute onClick
 -keepclassmembers class * extends android.app.Activity {
    public void *(android.view.View);
 }
 
+# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
@@ -38,3 +46,27 @@
 -keep class * implements android.os.Parcelable {
   public static final android.os.Parcelable$Creator *;
 }
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.**
+
+# 1.6 でSSLエラーを処理するために仕込んだコードの難読化を防止
+-dontwarn android.**
+-keep public class android.net.http.SslError {
+	*;
+}
+-keep public class android.webkit.ClientCertRequestHandler {
+	*;
+}
+-keep public class android.webkit.WebViewClient {
+	*;
+}
+-keep public class * extends android.webkit.WebViewClient {
+	*;
+}

res/layout/dlg_album_new.xml

@@ -16,9 +16,9 @@
 		  android:layout_height="wrap_content"
 		  android:orientation="vertical"
 		>
-			<LinearLayout 
+			<LinearLayout
 				android:layout_marginTop="4dp"
-			 	android:layout_width="match_parent"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="horizontal"
 			>
@@ -36,16 +36,16 @@
 					android:id="@+id/etTitle"
 				/>
 			</LinearLayout>
-			<LinearLayout 
+			<LinearLayout
 				android:layout_marginTop="4dp"
-			 	android:layout_width="match_parent"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="horizontal"
 			>
 				<TextView
-				  	android:layout_width="wrap_content"
-				  	android:layout_height="wrap_content"
-				  	android:text="@string/album_description"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/album_description"
 				/>
 				<EditText
 					android:layout_width="0dp"
@@ -56,21 +56,21 @@
 					android:id="@+id/etDesc"
 				/>
 			</LinearLayout>
-			<LinearLayout 
-			 	android:layout_width="match_parent"
+			<LinearLayout
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="horizontal"
 				android:baselineAligned="false"
 			>
-				<LinearLayout 
-				 	android:layout_width="0dp"
+				<LinearLayout
+					android:layout_width="0dp"
 					android:layout_height="wrap_content"
 					android:layout_weight="1"
 					android:orientation="vertical"
 				>
 					<TextView
 						android:layout_marginTop="4dp"
-					 	android:layout_width="match_parent"
+						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:text="@string/album_privacy"
 					/>
@@ -80,8 +80,8 @@
 						android:id="@+id/spPrivacy"
 					/>
 				</LinearLayout>
-				<LinearLayout 
-				 	android:layout_width="0dp"
+				<LinearLayout
+					android:layout_width="0dp"
 					android:layout_height="wrap_content"
 					android:layout_weight="1"
 					android:orientation="vertical"

res/values-ja/strings.xml

@@ -4,10 +4,12 @@
 <string name="about">このアプリについて</string>
 <string name="account">アカウント</string>
 <string name="account_added">アカウントが設定されました</string>
-<string name="account_add_title">アカウントの追加</string>
+<string name="account_add_summary">Imgurアカウントとアプリの連携を設定します</string>
+<string name="account_add_title">アカウント認証</string>
 <string name="account_all">全アカウント</string>
 <string name="account_anonymous">(名無し)</string>
-<string name="account_delete_title">アカウントの削除</string>
+<string name="account_delete_summary">Imgurアカウントとアプリの連携を解除します</string>
+<string name="account_delete_title">アカウント認証を除去</string>
 <string name="account_info_querying">アカウント情報の取得中です&#8230;</string>
 <string name="account_not_selected">アカウントが選択されていません</string>
 <string name="account_settings">アカウントの設定(必須ではありません)</string>
@@ -16,7 +18,7 @@
 <string name="act_history"		 >Imgur マッシュ/ 投稿履歴</string>
 <string name="act_main"			 >Imgur マッシュ</string>
 <string name="act_multiple"		 >Imgur 一括投稿</string>
-<string name="act_oauth"		 >Imgur マッシュ/ アカウントの追加</string>
+<string name="act_oauth"		 >Imgur マッシュ/ アカウント認証</string>
 <string name="act_pref"			 >Imgur マッシュ/ 設定</string>
 <string name="act_resize_preset" >Imgur マッシュ/ リサイズ指定</string>
 <string name="album_add">アルバムの作成</string>
@@ -53,6 +55,8 @@
 <string name="delete_complete">画像を削除しました</string>
 <string name="delete_hash_invalid">サーバからは既に削除されていたようです</string>
 <string name="delete_hash_missing">削除ハッシュが見つかりません</string>
+<string name="disable_ssl_certificate_validation_summary">有効にすると、サーバのSSL証明書の検証を行いません。SSL証明書のエラーを回避できますが、安全性は低下します。</string>
+<string name="disable_ssl_certificate_validation_title">SSL証明書を検証しない</string>
 <string name="edit">加工</string>
 <string name="edit_autostart_summary">有効にすると、画像が選択されたらすぐに画像加工を開始します</string>
 <string name="edit_autostart_title">画像加工を自動開始</string>
@@ -146,6 +150,7 @@
 <string name="upload_progress_sizecheck">アップロードサイズを測定中です…</string>
 <string name="upload_wait_response">レスポンス待機中…</string>
 <string name="uri_parse_error">ファイルパスを調べられません\n%1$s</string>
+<string name="usage">オンラインマニュアル</string>
 
 <!-- ここから長いテキスト-->
 

res/values/strings.xml

@@ -4,10 +4,12 @@
 <string name="about">about this app</string>
 <string name="account">account</string>
 <string name="account_added">account has been configured.</string>
-<string name="account_add_title">add account</string>
+<string name="account_add_summary">authenticate access from this app to your Imgur account.</string>
+<string name="account_add_title">account authentication</string>
 <string name="account_all">all account</string>
 <string name="account_anonymous">(anonymous)</string>
-<string name="account_delete_title">remove account</string>
+<string name="account_delete_summary">remove access token of this app and your Imgur account.</string>
+<string name="account_delete_title">remove account authentication</string>
 <string name="account_info_querying">retrieving account information&#8230;</string>
 <string name="account_not_selected">account is not selected.</string>
 <string name="account_settings">account settings</string>
@@ -53,6 +55,8 @@
 <string name="delete_complete">image was deleted.</string>
 <string name="delete_hash_invalid">maybe already deleted.</string>
 <string name="delete_hash_missing">missing delete hash</string>
+<string name="disable_ssl_certificate_validation_summary">if checked,this app don\'t validate server\'s SSL certificate. helpful for avoid SSL certificate error, but this option has security risk.</string>
+<string name="disable_ssl_certificate_validation_title">disable validation of SSL certificate</string>
 <string name="edit">edit</string>
 <string name="edit_autostart_summary">if checked, automatically start editor when image is picked.</string>
 <string name="edit_autostart_title">auto start editor</string>
@@ -146,6 +150,7 @@
 <string name="upload_progress_sizecheck">calculate upload size&#8230;</string>
 <string name="upload_wait_response">waiting response&#8230;</string>
 <string name="uri_parse_error">cannot detect file path from URI:\n%1$s</string>
+<string name="usage">online manual</string>
 
 <!-- ここから長いテキスト-->
 <string name="about_thisapp">About this app:\nthis is image uploader for Imgur, and also Mushroom IME extension.</string>

res/xml/pref.xml

@@ -8,10 +8,17 @@
 		<Preference
 			android:key="pref_add_account"
 			android:title="@string/account_add_title"
+			android:summary="@string/account_add_summary"
 		/>
 		<jp.juggler.ImgurMush.Pref_RemoveAccount
 			android:key="pref_del_account"
 			android:title="@string/account_delete_title"
+			android:summary="@string/account_delete_summary"
+		/>
+		<CheckBoxPreference
+			android:key="disable_ssl_certificate_validation"
+			android:title="@string/disable_ssl_certificate_validation_title"
+			android:summary="@string/disable_ssl_certificate_validation_summary"
 		/>
 	</PreferenceCategory>