• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoawindowspythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdombtronvb.netdirectxarduinopreviewerゲームエンジン

メモ帳 for Android


Commit MetaInfo

Révision6a2143d6b6770219e9d9f98ed7d1e10738f007c4 (tree)
l'heure2015-05-14 23:11:35
AuteurKana Koda <kodakana@user...>
CommiterKana Koda

Message de Log

*Updated Hungarian translation(thanks naren93).
*Implemented the remaining error handlings on ProtectActivity.

Change Summary

Modification

Binary files a/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$2.class and b/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$2.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$3.class and b/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$3.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$4.class and b/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$4.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$5.class and b/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$5.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$DeleteDialog.class and b/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$DeleteDialog.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$DetailDialog.class and b/bin/classes/org/pulpdust/lesserpad/LesserPadActivity$DetailDialog.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/LesserPadActivity.class and b/bin/classes/org/pulpdust/lesserpad/LesserPadActivity.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/ProtectActivity$1.class and b/bin/classes/org/pulpdust/lesserpad/ProtectActivity$1.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/ProtectActivity$2.class and b/bin/classes/org/pulpdust/lesserpad/ProtectActivity$2.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/ProtectActivity.class and b/bin/classes/org/pulpdust/lesserpad/ProtectActivity.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/R$string.class and b/bin/classes/org/pulpdust/lesserpad/R$string.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/R$style.class and b/bin/classes/org/pulpdust/lesserpad/R$style.class differ
Binary files a/bin/classes/org/pulpdust/lesserpad/R$xml.class and b/bin/classes/org/pulpdust/lesserpad/R$xml.class differ
--- a/gen/org/pulpdust/lesserpad/R.java
+++ b/gen/org/pulpdust/lesserpad/R.java
@@ -164,6 +164,7 @@ public final class R {
164164 public static final int mes_not_open=0x7f06000b;
165165 public static final int mes_not_save=0x7f060009;
166166 public static final int mes_pass_invalid=0x7f06005e;
167+ public static final int mes_pass_notread=0x7f06005f;
167168 public static final int mes_rename=0x7f060010;
168169 public static final int mes_rename_fail=0x7f060011;
169170 public static final int mes_save=0x7f06000a;
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -14,6 +14,8 @@
1414 <string name="mes_rename">Új fájlnév</string>
1515 <string name="mes_rename_fail">Fájl nem nevezhető át</string>
1616 <string name="mes_move_fail">Mappa változtatása sikertelen</string>
17+ <string name="mes_dis_spec_path">A megadott útvonal nem használható. Az SD kártya gyökerét ne használd.</string>
18+ <string name="menu_cancel">Ne mentsd</string>
1719 <string name="menu_share">Szöveg megosztása</string>
1820 <string name="menu_cut">Kivágás</string>
1921 <string name="menu_copy">Másolás</string>
@@ -42,6 +44,8 @@
4244 <string name="dialog_ok">Ok</string>
4345 <string name="dialog_cancel">Mégse</string>
4446 <string name="dialog_rename">Átnevezés</string>
47+ <string name="dialog_presave">Nincs mentve</string>
48+ <string name="dialog_notfiled">Nincs név</string>
4549 <string name="label_new">Új</string>
4650 <string name="label_rename">Átnevezés</string>
4751 <string name="label_delete">Törlés</string>
@@ -71,4 +75,14 @@
7175 <string name="address">Cím</string>
7276 <string name="version">Verzió</string>
7377 <string name="license">Licensz</string>
78+ <string name="dialog_protect">Adatvédelem</string>
79+ <string name="dialog_enter_enckey">Üsd be a fájlhoz alkalmazandó jelszót</string>
80+ <string name="dialog_enter_deckey">Üsd be a fájlhoz alkalmazott jelszót</string>
81+ <string name="menu_enc">Titkosítás</string>
82+ <string name="menu_dec">Titkosítás feloldása</string>
83+ <string name="mes_change_ext_fail">Fájl kiterjesztésének megváltoztatása sikertelen</string>
84+ <string name="mes_encrypt_fail">Titkosítás feloldása sikertelen</string>
85+ <string name="mes_save_encrypt">Mentve titkosított szövegként</string>
86+ <string name="mes_save_clear">Mentve szövegként</string>
87+ <string name="mes_pass_invalid"> A jelszó nem egyezik</string>
7488 </resources>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -91,4 +91,5 @@
9191 <string name="mes_save_encrypt">暗号文として保存しました。</string>
9292 <string name="mes_save_clear">平文として保存しました。</string>
9393 <string name="mes_pass_invalid">パスワードが一致しません。</string>
94+ <string name="mes_pass_notread">パスワードを読み取れませんでした。</string>
9495 </resources>
--- a/res/values/define.xml
+++ b/res/values/define.xml
@@ -1,6 +1,6 @@
11 <?xml version="1.0" encoding="utf-8"?>
22 <resources>
3- <string name="app_ver">0.893</string>
3+ <string name="app_ver">0.894</string>
44 <string name="app_lic">GNU GPL v3</string>
55 <string name="app_author">Kodakana&lt;kodakana.hws@gmail.com&gt;</string>
66 <string name="app_copy">&#169; 2015 Kodakana &amp; Good Contributors</string>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -92,5 +92,6 @@
9292 <string name="mes_save_encrypt">Has been saved as encrypted text.</string>
9393 <string name="mes_save_clear">Has been saved as clear text.</string>
9494 <string name="mes_pass_invalid">Password do not match.</string>
95+ <string name="mes_pass_notread">Could not read the password.</string>
9596
9697 </resources>
\ No newline at end of file
--- a/src/org/pulpdust/lesserpad/LesserPadActivity.java
+++ b/src/org/pulpdust/lesserpad/LesserPadActivity.java
@@ -447,7 +447,6 @@ public class LesserPadActivity extends FragmentActivity implements TextWatcher {
447447 Log.e(TAG, "fileOpen::IOError");
448448 return false;
449449 } catch (GeneralSecurityException e) {
450- // TODO Auto-generated catch block
451450 Log.e(TAG, e.getMessage());
452451 return false;
453452 }
@@ -1023,32 +1022,27 @@ public class LesserPadActivity extends FragmentActivity implements TextWatcher {
10231022 to = new File(path, name_to);
10241023 }
10251024 if (from.renameTo(to)){
1026- // TODO Toast
10271025 name = name_to;
10281026 Toast.makeText(getApplicationContext(), R.string.mes_save_encrypt, Toast.LENGTH_SHORT).show();
10291027 setLabel(name);
10301028 break;
10311029 } else {
1032- // TODO Toast
10331030 Log.e(TAG, "Can not rename.");
10341031 priv = false;
10351032 Toast.makeText(getApplicationContext(), R.string.mes_change_ext_fail, Toast.LENGTH_SHORT).show();
10361033 break;
10371034 }
10381035 } else {
1039- // TODO Toast
10401036 Log.e(TAG, "Can not save.");
10411037 Toast.makeText(getApplicationContext(), R.string.mes_not_save, Toast.LENGTH_SHORT).show();
10421038 break;
10431039 }
10441040 } catch (UnsupportedEncodingException e) {
1045- // TODO Auto-generated catch block
10461041 e.printStackTrace();
10471042 Log.e(TAG, e.getMessage());
10481043 Toast.makeText(getApplicationContext(), R.string.mes_encrypt_fail, Toast.LENGTH_SHORT).show();
10491044 break;
10501045 } catch (GeneralSecurityException e) {
1051- // TODO Auto-generated catch block
10521046 e.printStackTrace();
10531047 Log.e(TAG, e.getMessage());
10541048 Toast.makeText(getApplicationContext(), R.string.mes_encrypt_fail, Toast.LENGTH_SHORT).show();
@@ -1060,7 +1054,6 @@ public class LesserPadActivity extends FragmentActivity implements TextWatcher {
10601054 if (resultCode == RESULT_OK){
10611055 // pass = data.getStringExtra(libLesserPad.CRYPT_PASS);
10621056 if (!pass.equals(data.getStringExtra(libLesserPad.CRYPT_PASS))){
1063- //TODO Toast
10641057 Log.e(TAG, "Password invalid.");
10651058 Toast.makeText(getApplicationContext(), R.string.mes_pass_invalid, Toast.LENGTH_SHORT).show();
10661059 break;
@@ -1081,20 +1074,17 @@ public class LesserPadActivity extends FragmentActivity implements TextWatcher {
10811074 to = new File(path, name_to);
10821075 }
10831076 if (from.renameTo(to)){
1084- // TODO Toast
10851077 name = name_to;
10861078 Toast.makeText(getApplicationContext(), R.string.mes_save_clear, Toast.LENGTH_SHORT).show();
10871079 setLabel(name);
10881080 break;
10891081 } else {
1090- // TODO Toast
10911082 Log.e(TAG, "Can not rename.");
10921083 priv = false;
10931084 Toast.makeText(getApplicationContext(), R.string.mes_change_ext_fail, Toast.LENGTH_SHORT).show();
10941085 break;
10951086 }
10961087 } else {
1097- // TODO Toast
10981088 Log.e(TAG, "Can not save.");
10991089 Toast.makeText(getApplicationContext(), R.string.mes_not_save, Toast.LENGTH_SHORT).show();
11001090 break;
@@ -1127,12 +1117,10 @@ public class LesserPadActivity extends FragmentActivity implements TextWatcher {
11271117 forFroyo ffy = new forFroyo();
11281118 return ffy.doEncrypt(pass, text);
11291119 } catch (UnsupportedEncodingException e){
1130- //TODO Toast
11311120 Log.e(TAG, e.getMessage());
11321121 Toast.makeText(getApplicationContext(), R.string.mes_encrypt_fail, Toast.LENGTH_SHORT).show();
11331122 return "";
11341123 } catch (GeneralSecurityException e){
1135- //TODO Toast
11361124 Log.e(TAG, e.getMessage());
11371125 Toast.makeText(getApplicationContext(), R.string.mes_encrypt_fail, Toast.LENGTH_SHORT).show();
11381126 return "";
--- a/src/org/pulpdust/lesserpad/ProtectActivity.java
+++ b/src/org/pulpdust/lesserpad/ProtectActivity.java
@@ -13,6 +13,7 @@ import android.view.View.OnClickListener;
1313 import android.widget.Button;
1414 import android.widget.EditText;
1515 import android.widget.TextView;
16+import android.widget.Toast;
1617
1718 public class ProtectActivity extends FragmentActivity {
1819
@@ -56,7 +57,6 @@ public class ProtectActivity extends FragmentActivity {
5657
5758 @Override
5859 public void onClick(View v) {
59- // TODO Auto-generated method stub
6060 finish();
6161 }
6262
@@ -76,11 +76,13 @@ public class ProtectActivity extends FragmentActivity {
7676 setResult(RESULT_OK, intent);
7777 finish();
7878 } catch (UnsupportedEncodingException e) {
79- // TODO Auto-generated catch block
8079 e.printStackTrace();
80+ Toast.makeText(getApplicationContext(), R.string.mes_pass_notread, Toast.LENGTH_SHORT).show();
81+ finish();
8182 } catch (GeneralSecurityException e) {
82- // TODO Auto-generated catch block
8383 e.printStackTrace();
84+ Toast.makeText(getApplicationContext(), R.string.mes_pass_notread, Toast.LENGTH_SHORT).show();
85+ finish();
8486 }
8587 }
8688