Fixed InfoActivity launching incorrectly, updated Gradle wrapper.

lwis · Jul 27, 2015 · 9192266 · 9192266 · flyingrub · Jul 27, 2015
1 parent 95c9b80
commit 9192266
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,9 +7,9 @@ android {
 
     defaultConfig {
         applicationId "com.lewisjuggins.miband"
-        versionCode 1
-        versionName "1.0"
-        minSdkVersion 19
+        versionCode 3
+        versionName "1.2"
+        minSdkVersion 21
         targetSdkVersion 22
     }
 
@@ -48,7 +48,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0-beta1'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.10.1'
     }
 }
@@ -73,5 +73,5 @@ dependencies {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.4'
+    gradleVersion = '2.5'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 24 09:30:28 GMT 2015
+#Mon Jul 27 16:54:49 BST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -38,8 +39,6 @@
             android:exported="true"
             tools:ignore="ExportedActivity" >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.INFO" />
             </intent-filter>
         </activity>

diff --git a/src/main/java/com/lewisjuggins/miband/ui/InfoActivity.java b/src/main/java/com/lewisjuggins/miband/ui/InfoActivity.java
@@ -56,7 +56,7 @@ public void onCreate(final Bundle savedInstanceState)
 
             try
             {
-                //startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(Locale.US, APP_STORE_URI, "com.twofortyfouram.locale", getPackageName()))).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)); //$NON-NLS-1$
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(Locale.US, APP_STORE_URI, "com.twofortyfouram.locale", getPackageName()))).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)); //$NON-NLS-1$
             }
             catch (final Exception e)
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ public void onCreate(final Bundle savedInstanceState) @@
                 try
                 {
-                    //startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(Locale.US, APP_STORE_URI, "com.twofortyfouram.locale", getPackageName()))).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)); //$NON-NLS-1$
+                    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(Locale.US, APP_STORE_URI, "com.twofortyfouram.locale", getPackageName()))).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)); //$NON-NLS-1$
                 }
                 catch (final Exception e)
                 {
@@ Expand Down @@