Update version to 2.2.9, Fix fabric issues #80 #101

hearsilent · hearsilent · commit 9bca9964933b · 2017-02-27T00:13:04.000+08:00
diff --git a/KUAS-AP-Material/app/build.gradle b/KUAS-AP-Material/app/build.gradle
@@ -16,21 +16,22 @@ repositories {
 
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.kuas.ap"
         minSdkVersion 15
-        targetSdkVersion 24
-        versionCode 20208
-        versionName "2.2.8"
+        targetSdkVersion 25
+        versionCode 20209
+        versionName "2.2.9"
     }
 
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
         exclude '.readme'
+        return void
     }
 
     buildTypes {
@@ -59,22 +60,23 @@ android {
                     'proguard-crashlytics.pro'
         }
     }
+    return void
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.android.support:design:24.1.1'
-    compile 'com.android.support:customtabs:24.1.1'
-    compile 'com.android.support:cardview-v7:24.1.1'
-    compile 'com.android.support:recyclerview-v7:24.1.1'
-    compile 'com.google.android.gms:play-services-analytics:9.4.0'
-    compile 'com.google.firebase:firebase-config:9.4.0'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:customtabs:25.2.0'
+    compile 'com.android.support:cardview-v7:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
+    compile 'com.google.android.gms:play-services-analytics:10.2.0'
+    compile 'com.google.firebase:firebase-config:10.2.0'
     compile 'com.loopj.android:android-async-http:1.4.9'
     compile 'com.google.code.gson:gson:2.7'
-    compile 'com.wdullaer:materialdatetimepicker:2.5.0'
+    compile 'com.wdullaer:materialdatetimepicker:3.1.2'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.1@aar') {
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
         transitive = true;
     }
 }
diff --git a/KUAS-AP-Material/app/src/main/AndroidManifest.xml b/KUAS-AP-Material/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
 	<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 	<uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
 	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+	<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
 
 	<application
 		android:name="silent.kuasapmaterial.base.SilentApplication"
diff --git a/KUAS-AP-Material/app/src/main/java/silent/kuasapmaterial/CourseVibrateAlarmService.java b/KUAS-AP-Material/app/src/main/java/silent/kuasapmaterial/CourseVibrateAlarmService.java
@@ -1,8 +1,11 @@
 package silent.kuasapmaterial;
 
+import android.app.NotificationManager;
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.PowerManager;
@@ -47,6 +50,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 		Boolean isVibrate = bundle.getBoolean("mode", false);
 
 		AudioManager audioManager = (AudioManager) getSystemService(AUDIO_SERVICE);
+		NotificationManager notificationManager =
+				(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
+				!notificationManager.isNotificationPolicyAccessGranted()) {
+			stopService();
+			return START_STICKY;
+		}
 		if (isVibrate) {
 			Memory.setInt(this, Constant.PREF_COURSE_VIBRATE_USER_SETTING,
 					audioManager.getRingerMode());
diff --git a/KUAS-AP-Material/app/src/main/java/silent/kuasapmaterial/SettingsActivity.java b/KUAS-AP-Material/app/src/main/java/silent/kuasapmaterial/SettingsActivity.java
@@ -1,14 +1,20 @@
 package silent.kuasapmaterial;
 
+import android.annotation.TargetApi;
 import android.app.Dialog;
+import android.app.NotificationManager;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SwitchCompat;
 import android.view.View;
 import android.widget.TextView;
@@ -25,6 +31,8 @@
 
 public class SettingsActivity extends SilentActivity implements View.OnClickListener {
 
+	private static final int PERMISSION_REQUEST_NOTIFICATION_POLICY_ACCESS_SETTING = 200;
+
 	private View mNotifyCourseView, mNotifyBusView, mHeadPhotoView, mAppVersionView, mFeedbackView,
 			mDonateView, mVibrateCourseView;
 	private SwitchCompat mNotifyCourseSwitch, mNotifyBusSwitch, mHeadPhotoSwitch,
@@ -93,6 +101,12 @@ private void restorePreference() {
 		mHeadPhotoSwitch.setChecked(Memory.getBoolean(this, Constant.PREF_HEAD_PHOTO, true));
 		mNotifyCourseSwitch.setChecked(Memory.getBoolean(this, Constant.PREF_COURSE_NOTIFY, false));
 		mNotifyBusSwitch.setChecked(Memory.getBoolean(this, Constant.PREF_BUS_NOTIFY, false));
+		NotificationManager notificationManager =
+				(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
+				!notificationManager.isNotificationPolicyAccessGranted()) {
+			Memory.setBoolean(this, Constant.PREF_COURSE_VIBRATE, false);
+		}
 		mVibrateCourseSwitch
 				.setChecked(Memory.getBoolean(this, Constant.PREF_COURSE_VIBRATE, false));
 	}
@@ -259,6 +273,19 @@ public void onTokenExpired() {
 		});
 	}
 
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if (requestCode == PERMISSION_REQUEST_NOTIFICATION_POLICY_ACCESS_SETTING) {
+			NotificationManager notificationManager =
+					(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
+					notificationManager.isNotificationPolicyAccessGranted()) {
+				setUpCourseVibrate();
+			}
+		}
+	}
+
 	private void setUpCourseVibrate() {
 		mTracker.send(
 				new HitBuilders.EventBuilder().setCategory("vibrate course").setAction("create")
@@ -272,6 +299,28 @@ private void setUpCourseVibrate() {
 			return;
 		}
 
+		NotificationManager notificationManager =
+				(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
+				!notificationManager.isNotificationPolicyAccessGranted()) {
+			mVibrateCourseSwitch.setChecked(false);
+			Memory.setBoolean(SettingsActivity.this, Constant.PREF_COURSE_VIBRATE, false);
+			new AlertDialog.Builder(this).setMessage(R.string.course_vibrate_permission)
+					.setPositiveButton(R.string.go_to_settings,
+							new DialogInterface.OnClickListener() {
+
+								@TargetApi(Build.VERSION_CODES.N)
+								@Override
+								public void onClick(DialogInterface dialogInterface, int i) {
+									Intent intent = new Intent(
+											android.provider.Settings.ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS);
+									startActivityForResult(intent,
+											PERMISSION_REQUEST_NOTIFICATION_POLICY_ACCESS_SETTING);
+								}
+							}).setNegativeButton(R.string.skip, null).show();
+			return;
+		}
+
 		final Dialog progressDialog = Utils.createLoadingDialog(this, R.string.loading);
 		progressDialog.show();
 		Utils.setUpCourseNotify(this, new GeneralCallback() {
diff --git a/KUAS-AP-Material/app/src/main/java/silent/kuasapmaterial/libs/VibrateHelper.java b/KUAS-AP-Material/app/src/main/java/silent/kuasapmaterial/libs/VibrateHelper.java
@@ -7,6 +7,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.crashlytics.android.answers.Answers;
+import com.crashlytics.android.answers.CustomEvent;
 import com.kuas.ap.R;
 
 import java.util.ArrayList;
@@ -21,7 +23,7 @@
 
 public class VibrateHelper {
 
-	public static void setCourseVibrate(Context context, List<List<CourseModel>> courseModelList) {
+	static void setCourseVibrate(Context context, List<List<CourseModel>> courseModelList) {
 		if (courseModelList == null) {
 			return;
 		}
@@ -92,23 +94,30 @@ public static void setCourseVibrate(Context context) {
 		List<CourseModel> courseModelList = Utils.loadCourseVibrate(context);
 		if (courseModelList != null) {
 			for (int i = 0; i < courseModelList.size(); i++) {
-				CourseModel courseModel = courseModelList.get(i);
-				if (!courseModel.start_time.contains(":") || !courseModel.end_time.contains(":")) {
-					List<String> sectionList = new ArrayList<>(Arrays.asList(
-							context.getResources().getStringArray(R.array.course_sections)));
-					courseModel.start_time =
-							context.getResources().getStringArray(R.array.start_time)[sectionList
-									.indexOf(courseModel.section)];
-					courseModel.end_time =
-							context.getResources().getStringArray(R.array.end_time)[sectionList
-									.indexOf(courseModel.section)];
-				}
-				if (i % 2 == 0) {
-					setCourseAlarm(context, courseModel.start_time, courseModel.dayOfWeek,
-							courseModel.notifyKey * 1000, true);
-				} else {
-					setCourseAlarm(context, courseModel.end_time, courseModel.dayOfWeek,
-							courseModel.notifyKey * 10000, false);
+				try {
+					CourseModel courseModel = courseModelList.get(i);
+					if (!courseModel.start_time.contains(":") ||
+							!courseModel.end_time.contains(":")) {
+						List<String> sectionList = new ArrayList<>(Arrays.asList(
+								context.getResources().getStringArray(R.array.course_sections)));
+						courseModel.start_time = context.getResources()
+								.getStringArray(R.array.start_time)[sectionList
+								.indexOf(courseModel.section)];
+						courseModel.end_time =
+								context.getResources().getStringArray(R.array.end_time)[sectionList
+										.indexOf(courseModel.section)];
+					}
+					if (i % 2 == 0) {
+						setCourseAlarm(context, courseModel.start_time, courseModel.dayOfWeek,
+								courseModel.notifyKey * 1000, true);
+					} else {
+						setCourseAlarm(context, courseModel.end_time, courseModel.dayOfWeek,
+								courseModel.notifyKey * 10000, false);
+					}
+				} catch (Exception e) {
+					Answers.getInstance().logCustom(
+							new CustomEvent("Gson").putCustomAttribute("Type", "Course Vibrate Set")
+									.putCustomAttribute("Exception", e.getMessage()));
 				}
 			}
 		}
diff --git a/KUAS-AP-Material/app/src/main/res/values-zh-rTW/strings.xml b/KUAS-AP-Material/app/src/main/res/values-zh-rTW/strings.xml
@@ -2,7 +2,7 @@
 	<string name="app_name">高應校務通</string>
 
 	<string name="update_note_title">更新日誌 %s</string>
-	<string name="update_note_content">更新：\n　105 學年度第 1 學期行事曆\n修正：\n　不會崩潰了不會崩潰了工程師很忙 der</string>
+	<string name="update_note_content">更新：\n　105 學年度第 2 學期行事曆</string>
 
 	<string name="splash_content">我們全都包了\n只剩下學校不包我們</string>
 	<string name="share">分享</string>
@@ -88,10 +88,12 @@
 	<string name="bus_notify_jiangong">建工</string>
 	<string name="bus_notify_yanchao">燕巢</string>
 	<string name="course_vibrate_hint">將於上課時轉為震動，下課時恢復！</string>
+	<string name="course_vibrate_permission">需要「零打擾存取權」方能自動轉為震動。</string>
 	<string name="course_notify_hint">將於上課前十分鐘提醒！</string>
 	<string name="course_notify_content" formatted="false">親，%s 上課教室在 %s！</string>
 	<string name="course_notify_unknown">外太空</string>
 	<string name="calender_app_not_found">找不到支援的行事曆 Apps</string>
+	<string name="go_to_settings">前往設定</string>
 
 	<string name="education_system">學制</string>
 	<string name="department">科系</string>
diff --git a/KUAS-AP-Material/app/src/main/res/values/strings.xml b/KUAS-AP-Material/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 	<string name="app_name">KUAS AP</string>
 
 	<string name="update_note_title">Update Notes %s</string>
-	<string name="update_note_content">更新：\n　105 學年度第 1 學期行事曆\n修正：\n　不會崩潰了不會崩潰了工程師很忙 der</string>
+	<string name="update_note_content">更新：\n　105 學年度第 2 學期行事曆</string>
 
 	<string name="splash_content">我們全都包了\n只剩下學校不包我們</string>
 	<string name="share">Share</string>
@@ -90,10 +90,12 @@
 	<string name="bus_notify_jiangong">JianGong</string>
 	<string name="bus_notify_yanchao">YanChao</string>
 	<string name="course_vibrate_hint">Will turn on silent mode during class, turn back to normal mode after class!</string>
+	<string name="course_vibrate_permission">Need "Do Not Disturb access" to auto mute.</string>
 	<string name="course_notify_hint">Reminder will pop up 10mins before class starts!</string>
 	<string name="course_notify_content" formatted="false">Class %s will be at room %s!</string>
 	<string name="course_notify_unknown">Outerspace~</string>
 	<string name="calender_app_not_found">Can\'t found any calender apps.</string>
+	<string name="go_to_settings">Settings</string>
 
 	<string name="education_system">Scheme</string>
 	<string name="department">Department</string>
