From 145f01a3449a10dd4bd74e3871e564123ae75871 Mon Sep 17 00:00:00 2001
From: Kaushik N Sanji <26028981+kaushiknsanji@users.noreply.github.com>
Date: Sat, 26 Oct 2019 23:18:39 +0530
Subject: [PATCH] chore: Prepare for release

---
 app/build.gradle                              | 20 +++++++++++++++++--
 app/src/main/AndroidManifest.xml              | 15 +++++++++++++-
 .../novalines/utils/JsonUtility.java          |  2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5751f41..a2078bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,12 +21,26 @@ def appPropertiesFile = rootProject.file("application.properties")
 def appProperties = new Properties()
 appProperties.load(new FileInputStream(appPropertiesFile))
 
+// Load the details for signing the APK
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
 android {
     // Constants defined for use with buildConfigField
     def STRING = "String"
     def GUARDIAN_API_KEY = "GUARDIAN_API_KEY"
     def GUARDIAN_API_KEY_VAL = '"' + appProperties['GUARDIAN_API_KEY_VAL'] + '"'
 
+    signingConfigs {
+        release {
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+        }
+    }
+
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "com.example.kaushiknsanji.novalines"
@@ -36,14 +50,16 @@ android {
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        archivesBaseName = "$applicationId-v$versionName"
 
         // Use the defined API KEY
         buildConfigField STRING, GUARDIAN_API_KEY, GUARDIAN_API_KEY_VAL
     }
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a0d25d..a7c9229 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.kaushiknsanji.novalines">
+    package="com.example.kaushiknsanji.novalines"
+    android:installLocation="auto">
 
     <!-- Permission for access to Internet -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -29,6 +30,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
+        <!-- Main Activity of the App -->
         <activity android:name=".NewsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -36,8 +39,18 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <!-- Activity for the Settings -->
         <activity android:name=".settings.SettingsActivity" />
+
+        <!-- Activity that displays info related to the App and its developer -->
         <activity android:name=".AboutActivity" />
+
+        <!-- Launcher Activity as alias to NewsActivity -->
+        <activity-alias
+            android:name=".LauncherActivity"
+            android:targetActivity=".NewsActivity" />
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/kaushiknsanji/novalines/utils/JsonUtility.java b/app/src/main/java/com/example/kaushiknsanji/novalines/utils/JsonUtility.java
index d1eb660..d482920 100644
--- a/app/src/main/java/com/example/kaushiknsanji/novalines/utils/JsonUtility.java
+++ b/app/src/main/java/com/example/kaushiknsanji/novalines/utils/JsonUtility.java
@@ -122,7 +122,7 @@ private static String readStream(InputStream urlConnectionInputStream) {
         //Reading the response through BufferedReader
         BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(urlConnectionInputStream));
         try {
-            String readStr = "";
+            String readStr;
             while ((readStr = bufferedReader.readLine()) != null) {
                 //When Not Null, appending the line read to the Builder
                 responseBuilder.append(readStr);