Merge pull request #45 from itsyash/master

developer specific keys in a separate properties file

.gitignore

@@ -4,6 +4,7 @@ local.properties
 bin/
 gen/
 obj/
+assets/developerSpecific/
 .classpath
 .settings
 *.so
@@ -13,4 +14,6 @@ src/org/geometerplus/android/fbreader/network/bookshare/socialnetworks/SocialNet
 project.properties
 res/raw/data__help__minihelp_en_fb2
 
+
+
 .DS_Store

HowToBuild

@@ -22,9 +22,18 @@ E.g., on my computer 'local.properties' consists of 2 lines:
   sdk.dir=/Users/geometer/android-sdk-mac_86
   ndk.dir=/Users/geometer/android-ndk-r4b
 
-2. You will have to edit src/org/geometerplus/android/fbreader/network/bookshare/BookshareDeveloperKey and enter your
-   Bookshare developer key if you want to access the Bookshare library. You can obtain a Bookshare developer key from
-   http://developer.bookshare.org.  You can also optionally enter your Bugsense key to get crash reports.
+2. Create a new folder 'developerSpecific' in assets folder.In that folder, Create 'developer.properties' file, that contains:
+        developerKey='your bookshare developer key'
+	bugSenseKey='your bugsense key'
+	optOutGoogleAnalytics='your choice'
+
+  If you want to access bookshare library, you will have to obtain a bookshare developer key at http://developer.bookshare.org.
+  You can also optionally enter your Bugsense key to get crash reports.
+
+ A sample file would be:
+    developerKey=abcdefgh123456789abcdefg
+	bugSenseKey=abcd12
+	optOutGoogleAnalytics=false
 
 3. If you use Linux or MacOS, just run 'ant clean debug' to create an installable package that will provide debugging info.
 

res/layout/bookshare_webservice_login.xml

@@ -35,7 +35,7 @@
 			android:layout_marginRight="20dip"
 			android:textColor="#000"
 			android:layout_height="50dip"
-			android:inputType="text"
+			android:inputType="textEmailAddress"
             android:contentDescription="@string/login_dialog_username_label"
             android:nextFocusRight="@+id/bookshare_login_password_edit_text"
             android:nextFocusDown="@+id/bookshare_login_password_edit_text"
@@ -92,7 +92,7 @@
 				android:layout_height="50dip"/>
 
 	</LinearLayout>
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	<LinearLayout
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical">

src/org/geometerplus/android/fbreader/FBReader.java

@@ -140,6 +140,10 @@ protected ZLFile fileFromIntent(Intent intent) {
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
+		BookshareDeveloperKey.initialize(getApplicationContext());
+		Log.i(LOG_LABEL,BookshareDeveloperKey.BUGSENSE_KEY);
+		Log.i(LOG_LABEL,BookshareDeveloperKey.DEVELOPER_KEY);
+		Log.i(LOG_LABEL,String.valueOf(BookshareDeveloperKey.OPT_OUT_GOOGLE_ANALYTICS));
 		BugSenseHandler.initAndStartSession(this, BookshareDeveloperKey.BUGSENSE_KEY);
 
         //todo:

src/org/geometerplus/android/fbreader/network/bookshare/BookshareDeveloperKey.java

@@ -1,14 +1,56 @@
 package org.geometerplus.android.fbreader.network.bookshare;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+
 /**
- * Enter your developer key here.
- * It will be read by other Bookshare classes
+ * This file reads the developer key from the developer.properties file in
+ * assets/developerSpecific folder. It will be read by other Bookshare classes.
  * You can obtain a developer key from http://developer.bookshare.org
  */
 public class BookshareDeveloperKey {
-
-	// Enter your developer key here
-	public static final String DEVELOPER_KEY = "";
-    public static final String BUGSENSE_KEY = "";
-    public static final boolean OPT_OUT_GOOGLE_ANALYTICS = false;
+
+	public static String DEVELOPER_KEY = "";
+	public static String BUGSENSE_KEY = "";
+	public static boolean OPT_OUT_GOOGLE_ANALYTICS = false;
+
+	public static void initialize(Context applicationContext) {
+		// TODO Auto-generated method stub
+		final Context mcontext = applicationContext;
+		getProperties(mcontext);
+
+	}
+
+	private static void getProperties(Context mcontext) {
+		// TODO Auto-generated method stub
+		Resources resources = mcontext.getResources();
+		AssetManager assetManager = resources.getAssets();
+
+		// Read from the /assets directory
+		try {
+			InputStream inputStream = assetManager
+					.open("developerSpecific/developer.properties");
+			Properties properties = new Properties();
+			properties.load(inputStream);
+			System.out.println("The properties are now loaded");
+			System.out.println("properties: " + properties);
+			BUGSENSE_KEY = properties.getProperty("bugSenseKey");
+			DEVELOPER_KEY = properties.getProperty("developerKey");
+			if (properties.getProperty("optOutGoogleAnalytics")
+					.equalsIgnoreCase("false")) {
+				OPT_OUT_GOOGLE_ANALYTICS = false;
+			} else {
+				OPT_OUT_GOOGLE_ANALYTICS = true;
+			}
+
+		} catch (IOException e) {
+			System.err.println("Failed to open developer.property file");
+			e.printStackTrace();
+		}
+	}
+
 }

src/org/geometerplus/android/fbreader/network/bookshare/Bookshare_Book_Details.java

@@ -127,6 +127,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.bookshare_blank_page);
+		Log.i(LOG_TAG,developerKey);
 		resources = getApplicationContext().getResources();
 		myActivity = this;
 		// Set full screen