update:

1.修改服务协议内容
2.移除firebase等错误代码，打包OS渠道

Author: jianxiang

build.gradle

@@ -44,7 +44,7 @@ allprojects {
 
         mavenCentral()
         maven { url "https://jitpack.io" }
-        maven { url 'https://dl.bintray.com/azeesoft/maven' }
+//        maven { url 'https://dl.bintray.com/azeesoft/maven' }
         //maven { url "http://mvn.leancloud.cn/nexus/content/repositories/public" }
     }
 }
@@ -91,9 +91,9 @@ ext {
     libOkHttp3Log = "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
 
     minSdkVersion = 14
-    targetSdkVersion = 29
-    compileSdkVersion = 29
-    buildToolsVersion = '29.0.2'
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.2'
 
     // firebase related https://firebase.google.com/docs/android/setup
     firebaseCore = "com.google.firebase:firebase-core:16.0.7"

qpysdk/build.gradle

@@ -20,6 +20,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['src/main/libs']
+
+        }
+    }
+
 //    externalNativeBuild {
 //        ndkBuild {
 //            path 'src/main/jni/Android.mk'

qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java

@@ -34,7 +34,7 @@ public interface QPyConstants extends BASE_CONF {
     final String KEY_NOTEBOOK2_RES = "setting.notebook2resource.path";
 
 
-//    String ABSOLUTE_PATH = Environment.getExternalStorageDirectory().getPath() + "/" + BASE_PATH;
+    String ABSOLUTE_PATH = Environment.getExternalStorageDirectory().getPath() + "/" + BASE_PATH;
 //    String ABSOLUTE_PATH = FileUtils.getPath().getPath() + "/" + BASE_PATH;
 //    String PY_CACHE_PATH = ABSOLUTE_PATH+"/"+PY_CACHE;
 //    String ABSOLUTE_LOG = ABSOLUTE_PATH + "/log/last.log";

qpython/build.gradle

@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 304
-        versionName "3.0.0"
+        versionCode 305
+        versionName "3.0.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
 

qpython/src/main/AndroidManifest.xml

@@ -71,7 +71,6 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>

qpython/src/main/java/org/qpython/qpy/main/activity/SplashActivity.java

@@ -48,10 +48,10 @@ private void initData() {
     }
 
     private void setAgreeContent() {
-        String one = "您可以阅读完整版";
-        String two = "《服务协议》";
-        String three = "和";
-        String four = "《隐私政策》";
+        String one = getString(R.string.user_agreement_bottom_split1);
+        String two = getString(R.string.user_agreement_bottom_split2);
+        String three = getString(R.string.user_agreement_bottom_split3);
+        String four = getString(R.string.user_agreement_bottom_split4);
 
         String content = one + two + three + four;
         SpannableString str = new SpannableString(content);
@@ -67,13 +67,13 @@ private void setAgreeContent() {
     }
 
     private void setContent() {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append("1.为了给您提供发布服务，我们可能会向您申请摄像头权限、麦克风权限、收集存储权限；\n");
-        buffer.append("2.为了向您推荐您附近的村庄，我们会向您申请位置权限；\n");
-        buffer.append("3.为了账号安全，我们会向您申请系统设备权限收集设备信息、日志信息；\n");
-        buffer.append("4.我们会努力采取各种安全技术保护您的个人信息。未经您同意，我们不会从第三方获取、共享或对外提供您的信息；\n");
-        buffer.append("5.您还可以访问、更正、删除您的个人信息，我们为您提供了注销、投诉等多种不同方式。");
-        binding.tvContent.setText(buffer.toString());
+//        StringBuffer buffer = new StringBuffer();
+//        buffer.append("1.为了给您提供发布服务，我们可能会向您申请摄像头权限、麦克风权限、收集存储权限；\n");
+//        buffer.append("2.为了向您推荐您附近的村庄，我们会向您申请位置权限；\n");
+//        buffer.append("3.为了账号安全，我们会向您申请系统设备权限收集设备信息、日志信息；\n");
+//        buffer.append("4.我们会努力采取各种安全技术保护您的个人信息。未经您同意，我们不会从第三方获取、共享或对外提供您的信息；\n");
+//        buffer.append("5.您还可以访问、更正、删除您的个人信息，我们为您提供了注销、投诉等多种不同方式。");
+        binding.tvContent.setText(R.string.user_agreement_text);
     }
 
     private void judgeAgreementStatus() {

qpython/src/main/res/values-zh-rCN/strings.xml

@@ -457,4 +457,15 @@
     <string name="privacy_agreement">服务协议</string>
     <string name="service_agreement">隐私政策</string>
 
+    <string name="user_agreement_text">1.为了让您使用手机的硬件特性进行编程，QPython可能会使用您申请摄像头权限、麦克风权限、读写存储等权限；\n\n
+            2.为了让您使用手机的地理位置用于编程，QPython可能会向您申请位置权限；\n\n
+        3.为了让您使用手机的账号信息用于编程，QPython可能会向您申请系统设备权限收集设备信息、日志信息；\n\n
+        4.我们会努力采取各种安全技术保护您的个人信息。未经您同意，我们不会从第三方获取、共享或对外提供您的信息；\n\n
+        5.如果不是你主动在系统设置->Apps->QPython权限中管理上述权限，QPython不会自动使用它们。\n\n</string>
+
+    <string name="user_agreement_bottom_split1">您可以阅读完整版</string>
+    <string name="user_agreement_bottom_split2">《服务协议》</string>
+    <string name="user_agreement_bottom_split3">和</string>
+    <string name="user_agreement_bottom_split4">《隐私政策》</string>
+
 </resources>

qpython/src/main/res/values/strings.xml

@@ -58,6 +58,18 @@
     <string name="internal_space"><![CDATA[Permissions & Storage]]></string>
     <string name="ftp_server">FTP Server</string>
 
+    <string name="user_agreement_text">1. In order to allow you to use the hardware features of your mobile phone for programming, QPython may apply for camera permission, microphone permission, read-write storage and other permissions;\n\n
+        2. In order to allow you to use the geographical location of your mobile phone for programming, QPython may apply to you for location permission;\n\n
+        3. In order to allow you to use the account information of your mobile phone for programming, QPython may apply for system device permission to collect device information and log information;\n\n
+        4. We will strive to adopt various security technologies to protect your personal information. Without your consent, we will not obtain, share or provide your information from a third party;\n\n
+        5. If you do not actively manage the above permissions in system settings - > Apps - > qpython permissions, QPython will not automatically use them.\n\n
+    </string>
+
+    <string name="user_agreement_bottom_split1">You can read the full </string>
+    <string name="user_agreement_bottom_split2">&#60;&#60;service agreement&#62;&#62; </string>
+    <string name="user_agreement_bottom_split3">and </string>
+    <string name="user_agreement_bottom_split4">&#60;&#60;privacy policy&#62;&#62;</string>
+
     <!---->
     <string name="application_terminal">Terminal</string>
     <string name="preferences">Preference</string>

qpython/src/od/AndroidManifest.xml

@@ -379,20 +379,6 @@
             android:name=".main.activity.NotebookListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"/>
 
-        <service
-            android:name=".main.service.MyFirebaseMessagingService"
-            tools:ignore="ExportedService">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
-            </intent-filter>
-        </service>
-        <service
-            android:name=".main.service.MyFirebaseInstanceIDService"
-            tools:ignore="ExportedService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
     </application>
 
     <meta-data

qpython/src/od/java/org/qpython/qpy/codeshare/ShareCodeUtil.java

@@ -528,99 +528,6 @@ public boolean uploadFile(String path, DatabaseReference.CompletionListener comp
         return true;
     }
 
-    public void getUploadedScripts(boolean forceRefresh, Activity context, Action1<List<CloudFile>> callback) {
-        if (CLEAR) {
-            return;
-        }
-        String content = FileHelper.getFileContents(FileUtils.getCloudMapCachePath(context.getApplicationContext()));
-        List<CloudFile> cloudFiles = content == null ? null : App.getGson().fromJson(content, new TypeToken<List<CloudFile>>() {
-        }.getType());
-        if (cloudFiles != null && !forceRefresh) {
-            Observable.just(cloudFiles)
-                    .subscribe(callback);
-        } else {
-            email = App.getUser()!=null?App.getUser().getEmail().replace(".","_"):"";
-            if (email.equals("")) {
-                Toast.makeText(context, "Waiting the firebase to initializ...",Toast.LENGTH_SHORT).show();
-
-            } else {
-                reference.child(CLOUD).child(email).child(INDEX).addListenerForSingleValueEvent(new ValueEventListener() {
-                    @Override
-                    public void onDataChange(DataSnapshot dataSnapshot) {
-                        HashMap<String, Object> value = (HashMap<String, Object>) dataSnapshot.getValue();
-                        if (value == null) {
-                            resetUsage(0);
-                            Observable.just(new ArrayList<CloudFile>())
-                                    .subscribe(callback);
-                            return;
-                        }
-                        List<CloudFile> cloudFiles = new ArrayList<>();
-                        for (String node : value.keySet()) {
-                            switch (node) {
-                                case SCRIPT:
-                                    HashMap<String, Object> script;
-                                    script = (HashMap<String, Object>) value.get(SCRIPT);
-                                    for (String o : script.keySet()) {
-                                        CloudFile cloudFile = new CloudFile();
-                                        cloudFile.setName(o);
-                                        cloudFile.setKey(SCRIPT + "/" + o);
-                                        cloudFile.setPath(SCRIPTS_PATH);
-                                        cloudFile.setUploadTime((String) script.get(o));
-                                        cloudFiles.add(cloudFile);
-                                    }
-                                    break;
-                                case PROJECT:
-                                    HashMap<String, Object> project = (HashMap<String, Object>) value.get(PROJECT);
-                                    for (String s : project.keySet()) {
-                                        CloudFile cloudFile = new CloudFile();
-                                        cloudFile.setKey(PROJECT + "/" + s);
-                                        String[] nodes = s.split(SLASH_REPLACE);
-                                        cloudFile.setName(nodes[nodes.length - 1]);
-                                        cloudFile.setProjectName(nodes[0]);
-                                        cloudFile.setPath(s.replace(nodes[0], ""));
-                                        cloudFile.setUploadTime((String) project.get(s));
-                                        cloudFiles.add(cloudFile);
-                                    }
-                                    break;
-                                default:
-                                    HashMap<String, Object> other = (HashMap<String, Object>) value.get(OTHER);
-                                    for (String s : other.keySet()) {
-                                        CloudFile cloudFile = new CloudFile();
-                                        cloudFile.setPath(s);
-                                        cloudFile.setKey(OTHER + "/" + s);
-                                        String[] nodes = s.split(SLASH_REPLACE);
-                                        boolean index = false;
-                                        for (String node1 : nodes) {
-                                            if (index) {
-                                                cloudFile.setProjectName(node1);
-                                                break;
-                                            } else if (node1.equals("projects3")) {
-                                                index = true;
-                                            }
-                                        }
-                                        cloudFile.setName(nodes[nodes.length - 1]);
-                                        cloudFile.setUploadTime((String) other.get(s));
-                                        cloudFiles.add(cloudFile);
-                                    }
-                                    break;
-                            }
-                        }
-                        resetUsage(cloudFiles.size());
-                        Observable.just(cloudFiles)
-                                .subscribe(callback);
-                        ACache.get(context).put(CLOUD_FILE, App.getGson().toJson(cloudFiles));
-
-                    }
-
-                    @Override
-                    public void onCancelled(DatabaseError databaseError) {
-
-                    }
-                });
-            }
-        }
-    }
-
     public void getFileContent(String path, Action1<String> callback) {
         reference.child(CLOUD)
                 .child(email)
@@ -645,19 +552,6 @@ public void onCancelled(DatabaseError databaseError) {
                 });
     }
 
-    public void deleteUploadScript(CloudFile cloudFile, DatabaseReference.CompletionListener listener) {
-        reference.child(CLOUD)
-                .child(email)
-                .child(cloudFile.getKey())
-                .removeValue(listener);
-        reference.child(CLOUD)
-                .child(email)
-                .child(INDEX)
-                .child(cloudFile.getKey())
-                .removeValue();
-        changeUsage(-1);
-    }
-
     public void initUsage(Action1<Integer> callback) {
         if (CLEAR) {
             return;