Forráskód Böngészése

Fixing issues mentioned in review.

Flole 8 éve
szülő
commit
043ff2ad8f

+ 9 - 8
res/layout/fingerprintlock.xml

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 <!--
-  ownCloud Android client application
+  Nextcloud Android client application
 
 
-  Copyright (C) 2017 Flole Systems
+  Copyright (C) 2017 Florian Lentz
 
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
 
 
   This program is distributed in the hope that it will be useful,
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_width="fill_parent"

+ 8 - 8
src/com/owncloud/android/ui/activity/FingerprintActivity.java

@@ -1,21 +1,21 @@
 /**
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *
  *   @author Florian Lentz
  *   @author Florian Lentz
  *   Copyright (C) 2017 Florian Lentz
  *   Copyright (C) 2017 Florian Lentz
  *
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *
  *   This program is distributed in the hope that it will be useful,
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 package com.owncloud.android.ui.activity;
 package com.owncloud.android.ui.activity;
 
 

+ 1 - 1
src/main/AndroidManifest.xml

@@ -44,7 +44,6 @@
 
 
     <!-- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
     <!-- WRITE_EXTERNAL_STORAGE may be enabled or disabled by the user after installation in
         API >= 23; the app needs to handle this -->
         API >= 23; the app needs to handle this -->
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 
     <!-- Next permissions are always approved in installation time,
     <!-- Next permissions are always approved in installation time,
@@ -57,6 +56,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
 
 
 
     <application
     <application

+ 1 - 0
src/main/res/values/strings.xml

@@ -613,6 +613,7 @@
     <string name="welcome_feature_3_text">Keep your photos safe</string>
     <string name="welcome_feature_3_text">Keep your photos safe</string>
 
 
     <string name="whats_new_skip">Skip</string>
     <string name="whats_new_skip">Skip</string>
+
     <string name="fingerprint_scan_finger">Please scan your finger</string>
     <string name="fingerprint_scan_finger">Please scan your finger</string>
     <string name="fingerprint_unknown">Finger not recognized</string>
     <string name="fingerprint_unknown">Finger not recognized</string>