Skip to content

Commit 6a99ce4

Browse files
upsilonupsilon
authored
Merge pull request #108 from opentween/change-appname
developブランチで使用するAssemblyProductの値を変更
2 parents 7605c0a + 96b083c commit 6a99ce4

6 files changed

Lines changed: 46 additions & 14 deletions

File tree

‎OpenTween/ApplicationEvents.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ internal class MyApplication
6363
[STAThread]
6464
static int Main(string[] args)
6565
{
66+
WarnIfApiKeyError();
6667
WarnIfRunAsAdministrator();
6768

6869
if (!CheckRuntimeVersion())
@@ -114,6 +115,17 @@ static int Main(string[] args)
114115
return 0;
115116
}
116117

118+
private static void WarnIfApiKeyError()
119+
{
120+
var canDecrypt = ApplicationSettings.TwitterConsumerKey.TryGetValue(out _);
121+
if (!canDecrypt)
122+
{
123+
var message = Properties.Resources.WarnIfApiKeyError_Message;
124+
MessageBox.Show(message, ApplicationSettings.ApplicationName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
125+
Environment.Exit(-1);
126+
}
127+
}
128+
117129
/// <summary>
118130
/// OpenTween が管理者権限で実行されている場合に警告を表示します
119131
/// </summary>

‎OpenTween/ApplicationSettings.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ internal static class ApplicationSettings
120120
/// <summary>
121121
/// Twitter API Key
122122
/// </summary>
123-
public static readonly ApiKey TwitterConsumerKey = ApiKey.Create("%e%lhBzdIOsT0NwiaraGF6M8Q==%DtKV/SIVVVGA0tnaubpG0c5VL52DtkndCd5bYNPfQ/M=%4pkaNg/LhtyFPUlhMG9v+2DWuYxlYZSB9md5J/azJbA=");
123+
public static readonly ApiKey TwitterConsumerKey = ApiKey.Create("%e%EGv00cec1j05bMzbfAnsug==%ApO4PjZvnhixxFDqNh5qeqUTyAIEhoDvhhTaspVVjoA=%48Wxazf5JpDdIbkG0I8nme6/weUdEmZMRqfXAmCNr+Y=");
124124

125125
/// <summary>
126126
/// Twitter API Key Secret
127127
/// </summary>
128-
public static readonly ApiKey TwitterConsumerSecret = ApiKey.Create("%e%qYUFwFZCk/oYRwkF+d5G1A==%wqJcbfvhm3avxQaFha6hjLZkuo07y0EOUzOfT66NyuR4KOe5V3Jgvw6Kvy5V/VKafZHmq8j6xyKzytQQa7kpUw==%VgfPeI7XK/zhds2Tk/QTo5hPe2/4rRsGnLascX5Lp1I=");
128+
public static readonly ApiKey TwitterConsumerSecret = ApiKey.Create("%e%p93BdDzlwbYIC5Ych/47OQ==%xYZTCYaBxzS4An3o7Qcigjp9QMtu5vi5iEAW/sNgoOoAUyuHJRPP3Ovs20ZV2fAYKxUDiu76dxLfObwI7QjSRA==%YEruRDAQdbJzO+y6kn7+U/uIyIyNra/8Ulo+L6KJcWA=");
129129

130130
//=====================================================================
131131
// Foursquare
@@ -134,12 +134,12 @@ internal static class ApplicationSettings
134134
/// <summary>
135135
/// Foursquare Client Id
136136
/// </summary>
137-
public static readonly ApiKey FoursquareClientId = ApiKey.Create("%e%PUhzXizCMlOCLv6AjDEwWw==%p6wCukrAWVmPv+mevyhIBJsTmld+nN8jqqdcrUM2bnqvVU9+W1V9rtMrM19Ew2A2Uw2N7yPAmymR6YgVxO5hZw==%PcIbp7rt0Bom/igLAbOR5TwIfdF7Ucej4+tCQuZ7ALE=");
137+
public static readonly ApiKey FoursquareClientId = ApiKey.Create("%e%zNX0U6Eul2bdpkzQgcd/WA==%koGoTYoVLvQ6T5bsnI+dJjJ+REMnlJIhTnibhI6MagmHPA5hzY6DQom+PpQxBZX2CS2fZW1Ac82HzTzb3J7gNw==%qOMdPQ3UN7IWT4jJegYQnRxorZm/zaEt7/n6fd1eFcM=");
138138

139139
/// <summary>
140140
/// Foursquare Client Secret
141141
/// </summary>
142-
public static readonly ApiKey FoursquareClientSecret = ApiKey.Create("%e%MfvV15MhI4znNalkQLKGUA==%ONIAN5e6ZUeCeAqFl6rkDIZWvKT9xEUA7S2c6H5KVs6Ba8p0fzxKnH+ay1x/awpjtTRtfkY7d8dOwouxEJJviQ==%WvG6oTGYIvUpKGyofIdAcP5jVTC7oLuK8KB7aT4U9vA=");
142+
public static readonly ApiKey FoursquareClientSecret = ApiKey.Create("%e%3Zw+G9P32WgIi1ooBeDSCg==%coygRxFBSrxMW5o4dkD64ftx0C7axFkJlceb52XqDaiQKkf8q0Szavcw+t3MsxFQTkwL3ob7mehmCSdSpJPLTA==%XTrAyfrDBzdeKGPIXTD2JFU65uZqh8fs9tyf+fLaJeY=");
143143

144144
//=====================================================================
145145
// bit.ly
@@ -148,12 +148,12 @@ internal static class ApplicationSettings
148148
/// <summary>
149149
/// bit.ly Client ID
150150
/// </summary>
151-
public static readonly ApiKey BitlyClientId = ApiKey.Create("%e%D6d+cV9roc9oRyFHlzzpNA==%5PU2keurc+lfK56rsbEftpHz9S/X4xVg8vRKLXHksspOtOeLXHlR55XdPX4vafIr%X5bBNiqWcqeIThNZmDkz3rM2ObtIYPqVV5ijCg4rlME=");
151+
public static readonly ApiKey BitlyClientId = ApiKey.Create("%e%VtBYaO301PMy/eesjAJwuQ==%wK9fwaXlaq2wOCbJqzfwUzf4h+xAUJ445+wjI6uT3ANyag2LPJBYpfCQ3V+qnNlR%kmyyVMp8JPubACjFEd1zZMV2bddMimSj86e/ONegTeI=");
152152

153153
/// <summary>
154154
/// bit.ly Client Secret
155155
/// </summary>
156-
public static readonly ApiKey BitlyClientSecret = ApiKey.Create("%e%p3whdM7O13e3Wos1EBCgZg==%uaZQscha5IYHVIwedXo4klPBMxzyFmJwB4cO3+hzTVm7KGhnxsHh44aoLfLTzuzI%mqFsvWt7k7ps2HcCjxwbZS66lGcFHae1rG6XWjxMqfY=");
156+
public static readonly ApiKey BitlyClientSecret = ApiKey.Create("%e%jvdQqgh0Aj4e8HANczWELA==%FHevK6YJ/5L083pCJnUQ65bfz+sbwLZw4hUXIOw9PXRa8YnmVZ2KMwuHRRbdZUZl%1f/0LoSAuC0wyfKMhiohXNPGWY7wyQbqr2XVyKtjpFk=");
157157

158158
//=====================================================================
159159
// TINAMI
@@ -162,7 +162,7 @@ internal static class ApplicationSettings
162162
/// <summary>
163163
/// TINAMI APIキー
164164
/// </summary>
165-
public static readonly ApiKey TINAMIApiKey = ApiKey.Create("%e%7hQ5WcIjLOahw9VNyIU4qA==%z/T24upQAfNub0WiMrxLjg==%Mh+7SC+8SR514jm8tSgrRqn70i+psuox5dyQ5cHh7zs=");
165+
public static readonly ApiKey TINAMIApiKey = ApiKey.Create("%e%OA+C4u5v/9Oc2xIOEKt6Ng==%xLrMgeXaYSIaW5LYEA2viA==%/0bWO/UMCYH2BRxPKvi7JCW/CXxp/JmincpFNRlvhOQ=");
166166

167167
//=====================================================================
168168
// Microsoft Translator API (Cognitive Service)
@@ -171,7 +171,7 @@ internal static class ApplicationSettings
171171
/// <summary>
172172
/// Translator Text API Subscription Key
173173
/// </summary>
174-
public static readonly ApiKey TranslatorSubscriptionKey = ApiKey.Create("%e%OftqWcavvEFL3ecdcE80KQ==%B/u2U2A84zfhHPV2MARqDTD0YPFruSgdOdP1+JqRaAAg5gEpTjCQfzr7noDN8YCa%73W3WtAt4e9G4HRou2Zu9s/D5cIQ8ccxDsv60KnLvWA=");
174+
public static readonly ApiKey TranslatorSubscriptionKey = ApiKey.Create("%e%ysNsopqjk7fEikJNfX3ZtQ==%ZS4Gzq9PSUzBGKabQWi5To2nVLl8R3D+i/7nj5dACFAkBvQkxmrgJCnvON9cdF/+%1bayEnkpd4gbcyTTwB9PILWdku3YS52FuHskkpIhlXQ=");
175175

176176
//=====================================================================
177177
// Imgur
@@ -180,12 +180,12 @@ internal static class ApplicationSettings
180180
/// <summary>
181181
/// Imgur Client ID
182182
/// </summary>
183-
public static readonly ApiKey ImgurClientId = ApiKey.Create("%e%+ncaqKgmWPsHj8vm9vuR0A==%sw2Vvu3QQAFqqUU9FTGeRQ==%3cJIVrvCot+8LU4/l9iYQtsjn3dUYOdere56VsQIpNU=");
183+
public static readonly ApiKey ImgurClientId = ApiKey.Create("%e%YQirOk0lRw8zjhrTPlyRrQ==%ysNbeo//DruosSIzXquwiw==%126uNNTZshuw/SW9hd1ME/KCMpKSfjeboSRtQRfVQwc=");
184184

185185
/// <summary>
186186
/// Imgur Client Secret
187187
/// </summary>
188-
public static readonly ApiKey ImgurClientSecret = ApiKey.Create("%e%p3wLXhBzIpGOBpYn0w5G4w==%y0UO+MKvGnebqWJd6nKLifBYecFc9i4Bdf6n5+SuDEoGFSaDF54zCeRvJ8pVk9DF%LY6jZ/duMjRprZSR0qiIj/dentKm7AtLMjQq17mdlCg=");
188+
public static readonly ApiKey ImgurClientSecret = ApiKey.Create("%e%+IHTR8uXh2Mig6zGkawjeA==%vYQDZ+Tw5Rol4mQRC/yzXywuaNPWgoL5kLIg5VdUiCnSX5EPGQC5+QUkTzGz/fqv%+mOv8ekXLoZKe05yyXJ8Sx0cjuimoPQA30k/571wVRw=");
189189

190190
//=====================================================================
191191
// Mobypicture
@@ -194,7 +194,7 @@ internal static class ApplicationSettings
194194
/// <summary>
195195
/// Mobypicture Developer Key
196196
/// </summary>
197-
public static readonly ApiKey MobypictureKey = ApiKey.Create("%e%gQlFICkgKMP5bZ15DfOFzQ==%n+3Dfxy4IMtFNljJgdDLuoh1MdzLAk6/ZsKdGugy3BA=%yuM7lNI8qFWYj6ppDdM2bC9EtHO+ms1G6vl9xTjijek=");
197+
public static readonly ApiKey MobypictureKey = ApiKey.Create("%e%1FQ6vgxHCduEDyyJ7UK1ug==%xNBXVlAgJ8XiXZ1LSgGvEL1Vk1m4EzQ+6T/yigTgRHw=%xCAlJ1gBpe8G1Us6wXZBkYGxccFvRyRhmnFM4ocuhHQ=");
198198

199199
//=====================================================================
200200
// Tumblr
@@ -203,6 +203,6 @@ internal static class ApplicationSettings
203203
/// <summary>
204204
/// Tumblr OAuth Consumer Key
205205
/// </summary>
206-
public static readonly ApiKey TumblrConsumerKey = ApiKey.Create("%e%WJZTGDwe4njFpgKGQi5jRg==%gY2QO1so6QOfWitwxYP8XbIp98AtN3tDtoK4Q6bUOePkXVlhr4uE/VxhMg56Nblxt34Zy/8hpQSi0hlhuS2drQ==%hGKO3RVp0WaT3coVbo3H65r2pmKB8TTuiIbBzAzaV1A=");
206+
public static readonly ApiKey TumblrConsumerKey = ApiKey.Create("%e%1jQuOn2+l8O9i0/ld/VV5Q==%SiBRxJWj4Cbq/btPs63Rr2xOyw4XgTlV+lVkHkvIapBRkUaqGJxV7R/j5ljX+QW0ruBXNy+cpZFeEZFfB2jvSQ==%3GdYHow0pAlPQRY/wquX1AaxjzSabStRj8zbTXct1S4=");
207207
}
208208
}

‎OpenTween/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
66
// アセンブリに関連付けられている情報を変更するには、
77
// これらの属性値を変更してください。
8-
[assembly: AssemblyTitle("OpenTween")]
8+
[assembly: AssemblyTitle("OpenTween (dev)")]
99
[assembly: AssemblyDescription("Client of Twitter. Free software(GPLv3)")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("OpenTween")]
12+
[assembly: AssemblyProduct("OpenTween (dev)")]
1313
[assembly: AssemblyCopyright("(C) 2011 OpenTween contributors")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]

‎OpenTween/Properties/Resources.Designer.cs‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenTween/Properties/Resources.en.resx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,10 @@ Do you retry to update status?</value></data>
347347
<data name="VimeoInfoText4"><value>Views:</value></data>
348348
<data name="VimeoInfoText5"><value>Comments:</value></data>
349349
<data name="VimeoInfoText6"><value>Length:</value></data>
350+
<data name="WarnIfApiKeyError_Message"><value>Failed to retrieve the API key.
351+
352+
If you change the product name of OpenTween, you must apply for a new API key and modify the ApplicationSettings.
353+
At least if the Twitter API key has been changed correctly, you can launch the application.</value></data>
350354
<data name="WarnIfRunAsAdministrator_Message"><value>It is not recommended to run {0} as administrator.
351355

352356
* {0} does not require administrator privileges.

‎OpenTween/Properties/Resources.resx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,10 @@
367367
<data name="VimeoInfoText4"><value>再生数:</value></data>
368368
<data name="VimeoInfoText5"><value>コメント数:</value></data>
369369
<data name="VimeoInfoText6"><value>再生時間:</value></data>
370+
<data name="WarnIfApiKeyError_Message"><value>API キーの取得に失敗しました。
371+
372+
OpenTween の製品名を変更して使用する場合は、新たに API キーを取得して ApplicationSetting.cs に設定し直してください。
373+
少なくとも Twitter API のキーが正しく設定されていれば、起動できる状態になります。</value></data>
370374
<data name="WarnIfRunAsAdministrator_Message"><value>{0}を管理者権限で実行する事は推奨されません。
371375

372376
* {0}は管理者権限を必要とするソフトウェアではありません。

0 commit comments

Comments
 (0)