Merge pull request #3 from studyplus/check-for-exception

Add exception handling on sample application

Author: x7c1

README.md

@@ -28,10 +28,15 @@ dependencies {
 Open an Activity to connect with Studyplus.
 
 ```java
-AuthTransit.from(activity).startActivity(
-	context.getString("app_consumer_key"),
-	context.getString("app_consumer_key_secret")
-);
+try {
+    AuthTransit.from(activity).startActivity(
+	    context.getString("app_consumer_key"),
+	    context.getString("app_consumer_key_secret")
+    );
+} catch (ActivityNotFoundException e) {
+    e.printStackTrace();
+    Toast.makeText(context, "Need for Studyplus 2.14.0+", Toast.LENGTH_SHORT).show();
+}
 ```
 
 Then save its result.
@@ -55,7 +60,13 @@ ApiRequest request = StudyRecordPostRequest.of(
 		.setDurationSeconds(2 * 60)
 		.build()
 );
-StudyplusApi.getClient(context).send(request);
+
+try {
+    StudyplusApi.getClient(context).send(request);
+} catch (AccessTokenNotFound e) {
+    e.printStackTrace();
+    Toast.makeText(context, "Access token not exists", Toast.LENGTH_SHORT).show();
+}
 ```
 
 ### More

SDKExample/src/main/java/jp/studyplus/android/sdk/example/ExampleActivity.java

@@ -1,6 +1,7 @@
 package jp.studyplus.android.sdk.example;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -16,6 +17,7 @@
 import jp.studyplus.android.sdk.service.api.StudyplusApi;
 import jp.studyplus.android.sdk.service.api.response.ErrorResponse;
 import jp.studyplus.android.sdk.service.api.response.SuccessfulResponse;
+import jp.studyplus.android.sdk.service.auth.AccessTokenNotFound;
 import jp.studyplus.android.sdk.service.auth.AuthTransit;
 import jp.studyplus.android.sdk.service.auth.CertificationStore;
 import jp.studyplus.android.sdk.service.studyrecord.StudyRecordBuilder;
@@ -57,7 +59,13 @@ public void onClick(View v) {
 					.setDurationSeconds(2 * 60)
 					.build());
 
-			StudyplusApi.getClient(context).send(request.with(this));
+			try {
+				StudyplusApi.getClient(context).send(request.with(this));
+			} catch (AccessTokenNotFound e) {
+				e.printStackTrace();
+				Toast.makeText(context, R.string. sample_certification_no_access_token, Toast.LENGTH_SHORT)
+						.show();
+			}
 		}
 
 		@Subscribe
@@ -84,10 +92,16 @@ private OnClickToAuth(Activity activity) {
 		}
 		@Override
 		public void onClick(View v) {
-			AuthTransit.from(activity).startActivity(
-				context.getString(R.string.sample_consumer_key),
-				context.getString(R.string.sample_consumer_key_secret)
-			);
+			try {
+				AuthTransit.from(activity).startActivity(
+						context.getString(R.string.sample_consumer_key),
+						context.getString(R.string.sample_consumer_key_secret)
+				);
+			} catch (ActivityNotFoundException e) {
+				e.printStackTrace();
+				Toast.makeText(context, R.string.sample_certification_studyplus_not_found, Toast.LENGTH_SHORT)
+						.show();
+			}
 		}
 	}
 

SDKExample/src/main/res/values/strings.xml

@@ -4,4 +4,6 @@
     <string name="app_name">SDK Example</string>
     <string name="hello_world">Hello world!!!</string>
 
+    <string name="sample_certification_no_access_token">アクセストークンがありません。先に認証をしてください。</string>
+    <string name="sample_certification_studyplus_not_found">Studyplus 2.14.0 以上のインストールが必要です。</string>
 </resources>

StudyplusAndroidSDK/src/main/java/jp/studyplus/android/sdk/service/api/StudyplusApi.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 
+import jp.studyplus.android.sdk.service.auth.AccessTokenNotFound;
 import jp.studyplus.android.sdk.service.auth.CertificationStore;
 
 
@@ -10,7 +11,12 @@
  */
 public class StudyplusApi {
 
-	public static ApiClient getClient(Context context){
+	/**
+	 * @param context Specifies application context.
+	 * @return client for StudyplusAPI
+	 * @throws AccessTokenNotFound
+	 */
+	public static ApiClient getClient(Context context) {
 		ApiCertification certification = CertificationStore.create(context).getDefault();
 		return new ApiClient(certification);
 	}

StudyplusAndroidSDK/src/main/java/jp/studyplus/android/sdk/service/auth/AuthTransit.java

@@ -1,6 +1,7 @@
 package jp.studyplus.android.sdk.service.auth;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 
@@ -24,7 +25,14 @@ public AuthTransit setRequestCode(int requestCode){
 		return new AuthTransit(activity, requestCode);
 	}
 
-	public void startActivity(String consumerKey, String consumerSecret){
+	/**
+	 * Start the certification {@link Activity} for API.
+	 *
+	 * @param consumerKey for API
+	 * @param consumerSecret for API
+	 * @throws ActivityNotFoundException when not installed Studyplus application or un-supported version.
+	 */
+	public void startActivity(String consumerKey, String consumerSecret) {
 		Intent intent = new Intent();
 		intent.setAction(Intent.ACTION_VIEW);
 		intent.putExtra("consumer_key", consumerKey);

StudyplusAndroidSDK/src/main/java/jp/studyplus/android/sdk/service/auth/CertificationStore.java

@@ -46,7 +46,13 @@ private Optional<String> findAccessToken(){
 		return Optional.fromNullable(preferences.getString(KEY_ACCESS_TOKEN, null));
 	}
 
-	public ApiCertification getDefault(){
+	/**
+	 * Return the basic {@link ApiCertification} instance for API.
+	 *
+	 * @return certification instance for API.
+	 * @throws AccessTokenNotFound
+	 */
+	public ApiCertification getDefault() {
 		Optional<String> token = findAccessToken();
 		if (!token.isPresent()){
 			throw new AccessTokenNotFound();