Merge pull request #29 from happyfoxinc/development

Version 1.1.3

Author: anirudh24seven

HelpStackExample/AndroidManifest.xml

@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

HelpStackExample/build.gradle

@@ -4,14 +4,12 @@ dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':helpstack')
 
-    compile ('com.android.support:appcompat-v7:19.1.0') {
-        force = true
-    }
+    compile 'com.android.support:appcompat-v7:22.2.0'
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     sourceSets {
         main {

HelpStackExample/src/com/example/helpstackexample/MainActivity.java

@@ -2,7 +2,7 @@
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -13,7 +13,7 @@
 import com.crashlytics.android.Crashlytics;
 import com.tenmiles.helpstack.HSHelpStack;
 
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 

helpstack/AndroidManifest.xml

@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

helpstack/build.gradle

@@ -4,21 +4,17 @@ apply plugin: 'maven'
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
 
-    compile ('com.android.support:appcompat-v7:19.1.0') {
-        force = true
-    }
+    compile 'com.android.support:appcompat-v7:22.2.0'
 
-    compile ('com.google.code.gson:gson:2.2.4') {
-        force = true
-    }
+    compile 'com.google.code.gson:gson:2.3'
 
     compile 'org.apache.httpcomponents:httpmime:4.2.6'
     compile 'com.mcxiaoke.volley:library:1.0.5'
 }
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     sourceSets {
         main {
@@ -49,7 +45,7 @@ uploadArchives {
     repositories.mavenDeployer {
         pom.groupId = 'com.tenmiles'
         pom.artifactId = 'helpstack'
-        pom.version = '1.1.2'
+        pom.version = '1.1.3'
         // Add other pom properties here if you want (developer details / licenses)
         repository(url: "file:///Users/anirudh/Desktop/gradleRelease/")
     }

helpstack/src/com/tenmiles/helpstack/HSHelpStack.java

@@ -44,7 +44,7 @@ public class HSHelpStack {
 
     /**
      *
-     * @param context
+     * @param context Context
      * @return singleton instance of this class.
      */
 	public static HSHelpStack getInstance(Context context) {
@@ -66,7 +66,7 @@ public static HSHelpStack getInstance(Context context) {
      *
      * Sets which gear to use in HelpStack. It has to be set before calling any show* functions.
      *
-     * @param gear
+     * @param gear Gear
      */
 	public void setGear(HSGear gear) {
 		this.gear = gear;
@@ -84,7 +84,7 @@ public HSGear getGear() {
      *
      * Starts a Help activity. It shows all FAQ and also let user report new issue if not found in FAQ.
      *
-     * @param activity
+     * @param activity Activity
      */
 	public void showHelp(Activity activity) {
 		activity.startActivity(new Intent("com.tenmiles.helpstack.ShowHelp"));
@@ -95,7 +95,7 @@ public void showHelp(Activity activity) {
      *
      * It is light weight call. Call this after calling setGear.
      *
-     * @param articleResId
+     * @param articleResId Article Resource ID
      */
     public void overrideGearArticlesWithLocalArticlePath(int articleResId) {
         assert gear != null : "Some gear has to be set before overriding gear with local article path";
@@ -106,7 +106,7 @@ public void overrideGearArticlesWithLocalArticlePath(int articleResId) {
      *
      * Shows a credit @ bottom of the page.
      *
-     * @param showCredits
+     * @param showCredits Show Credits or not
      */
     public void setShowCredits(boolean showCredits) {
         this.showCredits = showCredits;
@@ -115,7 +115,6 @@ public void setShowCredits(boolean showCredits) {
     /**
      *
      * @return if credit can be shown.
-     * @default Yes
      */
     public boolean getShowCredits() {
         return this.showCredits;

helpstack/src/com/tenmiles/helpstack/activities/EditAttachmentActivity.java

@@ -33,7 +33,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -48,7 +48,7 @@
 import java.io.FileNotFoundException;
 import java.util.UUID;
 
-public class EditAttachmentActivity extends ActionBarActivity {
+public class EditAttachmentActivity extends AppCompatActivity {
 
     private final int REQUEST_CODE_PHOTO_PICKER = 100;
 

helpstack/src/com/tenmiles/helpstack/activities/HSActivityParent.java

@@ -26,7 +26,7 @@
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Window;
 
 /**
@@ -35,7 +35,7 @@
  * @author Nalin Chhajer
  *
  */
-public class HSActivityParent extends ActionBarActivity {
+public class HSActivityParent extends AppCompatActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

helpstack/src/com/tenmiles/helpstack/fragments/ImageAttachmentDisplayFragment.java

@@ -33,7 +33,6 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.view.MenuItemCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;

helpstack/src/com/tenmiles/helpstack/gears/HSDeskGear.java

@@ -664,7 +664,7 @@ public DeskBaseListener(OnFetchedSuccessListener successListener,
 
     private class DeskJsonObjectRequest extends JsonObjectRequest {
 
-        protected static final int TIMEOUT_MS = 0;
+        protected static final int TIMEOUT_MS = 10000;
 
         /** Default number of retries for image requests */
         protected static final int MAX_RETRIES = 0;

helpstack/src/com/tenmiles/helpstack/gears/HSHappyfoxGear.java

@@ -523,7 +523,7 @@ public CreateNewTicketSuccessListener(HSUser user, OnNewTicketFetchedSuccessList
 	private class TicketFormRequest extends Request<JSONObject> {
 
 		/** Socket timeout in milliseconds for image requests */
-		protected static final int TIMEOUT_MS = 0;
+		protected static final int TIMEOUT_MS = 10000;
 
 		/** Default number of retries for image requests */
 		protected static final int MAX_RETRIES = 0;

helpstack/src/com/tenmiles/helpstack/gears/HSZendeskGear.java

@@ -651,7 +651,7 @@ public ZendeskBaseListener(OnFetchedSuccessListener successListener,
 
     private class ZendeskJsonObjectRequest extends JsonObjectRequest {
 
-        protected static final int TIMEOUT_MS = 0;
+        protected static final int TIMEOUT_MS = 10000;
 
         /** Default number of retries for image requests */
         protected static final int MAX_RETRIES = 0;