Merge branch 'release/1.2.4'

Amab · Mar 15, 2015 · 9610993 · 9610993
2 parents 87b23d1 + b8f94d0
commit 9610993
Show file tree

Hide file tree

Showing 24 changed files with 296 additions and 553 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,4 @@ gradlew
 gradlew.bat
 import-summary.txt
 local.properties
-settings.gradle
-SWADroid.iml
-app/lint.xml
-app/app.iml
+app/lint.xml
diff --git a/SWADroid.iml b/SWADroid.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/app/app.iml b/app/app.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
@@ -24,18 +25,21 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -79,22 +83,22 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="ksoap2-j2se-3.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
-    <orderEntry type="library" exported="" name="ksoap2-android-3.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
-    <orderEntry type="library" exported="" name="kxml-2.2.4" level="project" />
-    <orderEntry type="library" exported="" name="kobjects-j2me-0.0-SNAPSHOT-20040926-2" level="project" />
-    <orderEntry type="library" exported="" name="xmlpull-1.1.3.3" level="project" />
-    <orderEntry type="library" exported="" name="ksoap2-base-3.3.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
-    <orderEntry type="library" exported="" name="play-services-6.1.71" level="project" />
+    <orderEntry type="library" exported="" name="ksoap2-j2se-3.4.0" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="ksoap2-base-3.4.0" level="project" />
+    <orderEntry type="library" exported="" name="ksoap2-android-3.4.0" level="project" />
     <orderEntry type="library" exported="" name="core-2.1" level="project" />
+    <orderEntry type="library" exported="" name="xmlpull-1.1.3.3" level="project" />
+    <orderEntry type="library" exported="" name="kxml-2.2.4" level="project" />
+    <orderEntry type="library" exported="" name="kobjects-j2me-0.0-SNAPSHOT-20040926-2" level="project" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,33 +1,26 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.0"
 
     defaultConfig {
         applicationId "es.ugr.swad.swadroid"
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 22
 
         testApplicationId "es.ugr.swad.swadroid.test"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
     }
-
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.2'
-    compile 'com.android.support:appcompat-v7:21.0.2'
-    compile 'com.google.android.gms:play-services:6.1.71'
+    compile 'com.android.support:support-v4:22.0.0'
+    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.google.android.gms:play-services:6.5.87'
     compile 'com.google.zxing:core:2.1'
-    compile 'com.google.code.gson:gson:2.3'
-    compile 'com.google.code.ksoap2-android:ksoap2-android:3.3.0'
+    compile 'com.google.code.gson:gson:2.3.1'
+    compile 'com.google.code.ksoap2-android:ksoap2-android:3.4.0'
     compile 'commons-io:commons-io:2.4'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="es.ugr.swad.swadroid"
     android:installLocation="auto"
-    android:versionCode="68"
-    android:versionName="1.2.3" >
+    android:versionCode="69"
+    android:versionName="1.2.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/app/src/main/java/com/google/zxing/client/android/CaptureActivity.java b/app/src/main/java/com/google/zxing/client/android/CaptureActivity.java
@@ -74,7 +74,7 @@ public class CaptureActivity extends Activity implements SurfaceHolder.Callback
 
     private static final String TAG = CaptureActivity.class.getSimpleName();
 
-    private static final long BULK_MODE_SCAN_DELAY_MS = 2000L;
+    private static final long BULK_MODE_SCAN_DELAY_MS = 1000L;
 
     private static final int[] sounds = {R.raw.beep, R.raw.klaxon};
 
@@ -347,12 +347,22 @@ public void handleDecode(Result rawResult, Bitmap barcode) {
         toastText.setGravity(Gravity.CENTER_VERTICAL);
         toastText.setTextSize(SCAN_TEXT_SIZE);
 
-        Toast toast = new Toast(getApplicationContext());
+        final Toast toast = new Toast(getApplicationContext());
         toast.setGravity(Gravity.CENTER_VERTICAL, 0, 0);
         toast.setDuration(Toast.LENGTH_SHORT);
         toast.setView(layout);
         toast.show();
 
+        // Hide message after delay
+        if(BULK_MODE_SCAN_DELAY_MS < 2000L) {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    toast.cancel();
+                }
+            }, BULK_MODE_SCAN_DELAY_MS);
+        }
+
         // Wait a moment or else it will scan the same barcode continuously about 3 times
         restartPreviewAfterDelay(BULK_MODE_SCAN_DELAY_MS);
     }

diff --git a/app/src/main/java/es/ugr/swad/swadroid/LoginActivity.java b/app/src/main/java/es/ugr/swad/swadroid/LoginActivity.java
@@ -301,6 +301,7 @@ private void recoverPasswordDialog() {
 
         final EditText user = new EditText(getApplicationContext());
         user.setTextColor(Color.BLACK);
+        user.setHintTextColor(Color.GRAY);
         user.setHint(getString(R.string.prompt_email));
 
         builder.setView(user)

diff --git a/app/src/main/java/es/ugr/swad/swadroid/SWADMain.java b/app/src/main/java/es/ugr/swad/swadroid/SWADMain.java
@@ -746,13 +746,21 @@ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition
                     activity = new Intent(ctx, GenerateQR.class);
                     startActivityForResult(activity, Constants.GENERATE_QR_REQUEST_CODE);
                 } else if (keyword.equals(getString(R.string.documentsDownloadModuleLabel))) {
-                    activity = new Intent(ctx, DownloadsManager.class);
-                    activity.putExtra("downloadsAreaCode", Constants.DOCUMENTS_AREA_CODE);
-                    startActivityForResult(activity, Constants.DOWNLOADSMANAGER_REQUEST_CODE);
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+                        activity = new Intent(ctx, DownloadsManager.class);
+                        activity.putExtra("downloadsAreaCode", Constants.DOCUMENTS_AREA_CODE);
+                        startActivityForResult(activity, Constants.DOWNLOADSMANAGER_REQUEST_CODE);
+                    } else {
+                        Toast.makeText(ctx, R.string.functionHoneycombMsg, Toast.LENGTH_LONG).show();
+                    }
                 } else if (keyword.equals(getString(R.string.sharedsDownloadModuleLabel))) {
-                    activity = new Intent(ctx, DownloadsManager.class);
-                    activity.putExtra("downloadsAreaCode", Constants.SHARE_AREA_CODE);
-                    startActivityForResult(activity, Constants.DOWNLOADSMANAGER_REQUEST_CODE);
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+                        activity = new Intent(ctx, DownloadsManager.class);
+                        activity.putExtra("downloadsAreaCode", Constants.SHARE_AREA_CODE);
+                        startActivityForResult(activity, Constants.DOWNLOADSMANAGER_REQUEST_CODE);
+                    } else {
+                        Toast.makeText(ctx, R.string.functionHoneycombMsg, Toast.LENGTH_LONG).show();
+                    }
                 } else if (keyword.equals(getString(R.string.myGroupsModuleLabel))) {
                     activity = new Intent(ctx, MyGroupsManager.class);
                     activity.putExtra("courseCode", Courses.getSelectedCourseCode());

diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Model.java b/app/src/main/java/es/ugr/swad/swadroid/model/Model.java
@@ -87,4 +87,14 @@ public boolean equals(Object obj) {
     public String toString() {
         return "Model [id=" + id + "]";
     }
+
+    @Override
+    public String getInnerText() {
+        return null;
+    }
+
+    @Override
+    public void setInnerText(String s) {
+
+    }
 }
diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java b/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java
@@ -512,7 +512,7 @@ protected void postConnect() {
 						+ getString(R.string.notificationsAlertMsg),
 						getString(R.string.app_name),
 						pendingIntent,
-						R.drawable.ic_launcher_swadroid,
+						R.drawable.ic_launcher_swadroid_notif,
 						R.drawable.ic_launcher_swadroid,
 						true,
 						true,

diff --git a/...main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java b/...main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java
@@ -475,7 +475,7 @@ private static void performSync(Context context, Account account, Bundle extras,
 						+ context.getString(R.string.notificationsAlertMsg),
 						context.getString(R.string.app_name),
 						pendingIntent,
-						R.drawable.ic_launcher_swadroid,
+						R.drawable.ic_launcher_swadroid_notif,
 						R.drawable.ic_launcher_swadroid,
 						true,
 						true,