removed share complete msgbox; cache bug fix

Author: paizhangliu

app/build.gradle

@@ -26,14 +26,14 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     implementation 'com.android.support:design:31'
     implementation 'com.android.support:support-v4:31'
-    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'androidx.browser:browser:1.4.0'
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
 }

app/src/main/java/com/macindex/macindex/MainActivity.java

@@ -113,13 +113,14 @@ protected void onCreate(final Bundle savedInstanceState) {
                 } else {
                     Log.w("MacIndex", "Database already initialized.");
                 }
-                initInterface(true);
 
                 // Cache clear if new version is registered
                 if (PrefsHelper.registerNewVersion(this)) {
                     clearCache();
                 }
 
+                initInterface(true);
+
                 // Deep Link Support, Activity Not Present
                 Uri deepLink = getIntent().getData();
                 if (deepLink != null) {

app/src/main/java/com/macindex/macindex/SpecsActivity.java

@@ -1215,7 +1215,7 @@ private void shareDialog() {
                     ClipboardManager clipboard = (ClipboardManager) SpecsActivity.this.getSystemService(Context.CLIPBOARD_SERVICE);
                     ClipData clip = ClipData.newPlainText("MacIndexModelInfo", modelInfo);
                     clipboard.setPrimaryClip(clip);
-                    finishShareDialog(shareEntries, shareDescription, which);
+                    Toast.makeText(SpecsActivity.this, shareDescription[which], Toast.LENGTH_LONG).show();
                 } else if (which == 2) {
                     // User choose info
                     // Construct the dialog view.
@@ -1275,7 +1275,7 @@ private void shareDialog() {
                                 ClipboardManager clipboard = (ClipboardManager) SpecsActivity.this.getSystemService(Context.CLIPBOARD_SERVICE);
                                 ClipData clip = ClipData.newPlainText("MacIndexModelInfo", modelInfo);
                                 clipboard.setPrimaryClip(clip);
-                                finishShareDialog(shareEntries, shareDescription, which);
+                                Toast.makeText(SpecsActivity.this, shareDescription[which], Toast.LENGTH_LONG).show();
                                 selectDialogCreated.dismiss();
                             } else {
                                 Toast.makeText(SpecsActivity.this, R.string.share_menu_null, Toast.LENGTH_LONG).show();
@@ -1290,7 +1290,7 @@ private void shareDialog() {
                     ClipboardManager clipboard = (ClipboardManager) SpecsActivity.this.getSystemService(Context.CLIPBOARD_SERVICE);
                     ClipData clip = ClipData.newPlainText("MacIndexShareLink", shareLink);
                     clipboard.setPrimaryClip(clip);
-                    finishShareDialog(shareEntries, shareDescription, which);
+                    Toast.makeText(SpecsActivity.this, shareDescription[which], Toast.LENGTH_LONG).show();
                 }
             } catch (Exception e) {
                 ExceptionHelper.handleException(this, e, "shareDialog", "Unable to create the share dialog.");
@@ -1394,16 +1394,6 @@ private String generateShareInfo(final List<Integer> entries) {
         return modelInfo.trim(); // Get rid of the last new line
     }
 
-    private void finishShareDialog(final String[] shareEntries, final String[] shareDescription, final int which) {
-        AlertDialog.Builder finishShareDialog = new AlertDialog.Builder(SpecsActivity.this);
-        finishShareDialog.setTitle(shareEntries[which]);
-        finishShareDialog.setMessage(shareDescription[which]);
-        finishShareDialog.setPositiveButton(R.string.link_confirm, (dialogInterface, i) -> {
-            // intentionally left blank
-        });
-        finishShareDialog.show();
-    }
-
     private void navPrev() {
         machineIDPosition--;
         refresh();

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

@@ -197,13 +197,13 @@
         <item>生成 MacIndex 分享链接</item>
     </string-array>
     <string-array name="share_description">
-        <item>可用的型号信息均已复制。\n该信息也可用于主页功能菜单处（“打开分享的机型”）。请参阅帮助内容。</item>
-        <item>所有可用的信息均已复制。\n该信息也可用于主页功能菜单处（“打开分享的机型”）。请参阅帮助内容。</item>
-        <item>已选择的信息均已复制。\n该信息也可用于主页功能菜单处（“打开分享的机型”）。请参阅帮助内容。</item>
-        <item>分享链接已复制，MacIndex 可以直接打开该链接。\n该链接也可用于主页功能菜单处（“打开分享的机型”）。请参阅帮助内容。</item>
+        <item>可用的型号信息均已复制</item>
+        <item>所有可用的信息均已复制</item>
+        <item>已选择的信息均已复制</item>
+        <item>分享链接已复制</item>
     </string-array>
     <string name="share_menu_null">请选择至少一项来继续</string>
     <string name="share_menu_not_applicable">（无信息）</string>
-    <string name="share_main_decode">要直接浏览某机型的详细参数，在此粘贴下列受支持的信息（请参阅帮助内容）：\nMacIndex 中的正式机型名称\n由 MacIndex 分享功能复制的信息\n由 MacIndex 生成的分享链接</string>
+    <string name="share_main_decode">要直接浏览某机型的详细参数，在此粘贴下列受支持的信息（请参阅帮助内容）：\n• MacIndex 中的正式机型名称\n• 由 MacIndex 分享功能复制的信息\n• 由 MacIndex 生成的分享链接</string>
     <string name="share_main_decode_failed">无法读取该信息，或该机型在这个版本中不存在</string>
 </resources>

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

@@ -217,13 +217,13 @@
         <item>Generate MacIndex Share Link</item>
     </string-array>
     <string-array name="share_description">
-        <item>Available model information copied.\nThis information could also be used in the Main Submenu ("Open Shared Model").</item>
-        <item>All available information copied.\nThis information could also be used in the Main Submenu ("Open Shared Model").</item>
-        <item>Selected information entries copied.\nThis information could also be used in the Main Submenu ("Open Shared Model").</item>
-        <item>Share link generated. MacIndex can recognize this link.\nThis link could also be used in the Main Submenu ("Open Shared Model").</item>
+        <item>Available model information copied</item>
+        <item>All available information copied</item>
+        <item>Selected information entries copied</item>
+        <item>Share link generated</item>
     </string-array>
     <string name="share_menu_null">Select at least one entry to continue</string>
     <string name="share_menu_not_applicable">(No Info)</string>
-    <string name="share_main_decode">To open the corresponding specification page directly, paste one of the following supported information:\nMachine name in MacIndex\nSharing information copied from MacIndex\nMacIndex share link generated by MacIndex</string>
+    <string name="share_main_decode">To open the corresponding specification page directly, paste one of the following supported information:\n• Machine name in MacIndex\n• Any sharing information copied from MacIndex\n• MacIndex share link generated by MacIndex</string>
     <string name="share_main_decode_failed">Cannot read the information, or this model does not exist in current version</string>
 </resources>